On Fri, Mar 23, 2012 at 02:15:43PM +0700, Peter A. Shevtsov wrote:

From: "Peter A. Shevtsov"

Signed-off-by: Peter A. Shevtsov ---

Thanks for the patch, but we've already covered this: https://bugs.archlinux.org/task/29022 It's not been pushed to the repo yet, and you've nicely pointed out that I didn't update the help messages. I'm hoping to do a mkinitcpio release this weekend. Thanks, dave

install/consolefont | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/install/consolefont b/install/consolefont index 7110c3c..0843718 100644 --- a/install/consolefont +++ b/install/consolefont @@ -5,7 +5,13 @@ build() {

# subshell to avoid namespace pollution ( - . "$BASEDIR/etc/rc.conf" + if [[ -e "$BASEDIR/etc/vconsole.conf" ]]; then + source "$BASEDIR/etc/vconsole.conf" + fi + source "$BASEDIR/etc/rc.conf" + if [[ -n "$FONT" ]]; then + CONSOLEFONT=$FONT + fi if [[ -n "$CONSOLEFONT" ]]; then for file in "$BASEDIR/usr/share/kbd/consolefonts/$CONSOLEFONT".psf?(u)?(.gz); do if [[ -e $file ]]; then @@ -21,7 +27,7 @@ build() { error "consolefont: requested font not found: \`%s'" "$CONSOLEFONT" exit 1 else - warning "consolefont: no font found in %s/etc/rc.conf" "${BASEDIR%/}" + warning "consolefont: no font found in %s/etc/vconsole.conf or %s/etc/rc.conf" "${BASEDIR%/}" "${BASEDIR%/}" exit 1 fi ) @@ -31,7 +37,7 @@ build() {

help() { cat <

-- 1.7.9.4