From be6c0716eec2e66d59ed9b5bce6219184f85351c Mon Sep 17 00:00:00 2001 From: "Jory A. Pratt" Date: Thu, 30 Sep 2010 07:33:52 -0500 Subject: surpress output of loadkeys, fix setfont path check --- sh/init-early.sh.Linux.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sh/init-early.sh.Linux.in b/sh/init-early.sh.Linux.in index e13af13..a1f5f8a 100644 --- a/sh/init-early.sh.Linux.in +++ b/sh/init-early.sh.Linux.in @@ -17,7 +17,7 @@ fi if [ -e /etc/runlevels/"$RC_DEFAULTLEVEL"/consolefont \ -o -e /etc/runlevels/"$RC_BOOTLEVEL"/consolefont ]; then printf "\033%s" "$termencoding" >"$CONSOLE" 2>/dev/null - if [ -r "$RC_LIBEXECDIR"/console/font -a -x /bin/setfont ]; then + if [ -r "$RC_LIBEXECDIR"/console/font -a -x /usr/bin/setfont ]; then font="$(cat "$RC_LIBEXECDIR"/console/font)" [ -c "$CONSOLE" ] && cons="-C $CONSOLE" setfont $cons "$RC_LIBEXECDIR"/console/"$font" 2>/dev/null @@ -29,7 +29,7 @@ if [ -e /etc/runlevels/"$RC_DEFAULTLEVEL"/keymaps \ -o -e /etc/runlevels/"$RC_BOOTLEVEL"/keymaps ]; then kbd_mode $kmode -C "$CONSOLE" 2>/dev/null if [ -r "$RC_LIBEXECDIR"/console/keymap ]; then - loadkeys "$RC_LIBEXECDIR"/console/keymap 2>/dev/null + loadkeys -q "$RC_LIBEXECDIR"/console/keymap 2>/dev/null fi fi -- cgit v1.2.3