diff options
| author | Jory A. Pratt <anarchy@gentoo.org> | 2010-09-30 07:33:52 -0500 |
|---|---|---|
| committer | Jory A. Pratt <anarchy@gentoo.org> | 2010-09-30 07:33:52 -0500 |
| commit | be6c0716eec2e66d59ed9b5bce6219184f85351c (patch) | |
| tree | 135239fc9baf8862b9149fca028b0da775598588 | |
| parent | 4ea75dd1d6c1e475f103f027fd05861d237add4d (diff) | |
surpress output of loadkeys, fix setfont path check
| -rw-r--r-- | sh/init-early.sh.Linux.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sh/init-early.sh.Linux.in b/sh/init-early.sh.Linux.in index e13af131..a1f5f8a0 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 |