From 91b86efedd70e6b83232057fbf2b089a47b76333 Mon Sep 17 00:00:00 2001 From: Roman Kyrylych Date: Thu, 6 Mar 2008 00:24:20 +0200 Subject: Revert back to not loading defkeymap * There is a patch for the kernel now, so no need to workaround the bug * Add a missing check for an empty KEYMAP Signed-off-by: Roman Kyrylych --- rc.sysinit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rc.sysinit') diff --git a/rc.sysinit b/rc.sysinit index b2b916e..069bf17 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -381,7 +381,7 @@ if echo "$LOCALE" | /bin/grep -qi utf ; then # the $CONSOLE check helps us avoid this when running scripts from cron echo 'if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then printf "\e%%G"; fi' >>/etc/profile.d/locale.sh stat_done - status "Loading Keyboard Map: $KEYMAP" /bin/loadkeys -q -u defkeymap $KEYMAP + [ -n "$KEYMAP" ] && status "Loading Keyboard Map: $KEYMAP" /bin/loadkeys -q -u $KEYMAP else stat_busy "Setting Consoles to legacy mode" # make non-UTF-8 consoles work on 2.6.24 and newer kernels @@ -392,7 +392,7 @@ else # the $CONSOLE check helps us avoid this when running scripts from cron echo 'if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then printf "\e%%@"; fi' >>/etc/profile.d/locale.sh stat_done - status "Loading Keyboard Map: $KEYMAP" /bin/loadkeys -q defkeymap $KEYMAP + [ -n "$KEYMAP" ] && status "Loading Keyboard Map: $KEYMAP" /bin/loadkeys -q $KEYMAP fi if [ -n "$CONSOLEFONT" ]; then -- cgit v1.2.3