From 28201f9c0bdb4fe75df434a0a58b9ac7cbe59e79 Mon Sep 17 00:00:00 2001 From: Roman Kyrylych Date: Fri, 9 Nov 2007 11:49:59 +0200 Subject: [PATCH] Improve error handling and add support for multiple keymaps Signed-off-by: Roman Kyrylych --- rc.sysinit | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/rc.sysinit b/rc.sysinit index f4729bf..ce0187c 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -354,13 +354,9 @@ 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 echo -ne "\e%G"; fi' >>/etc/profile.d/locale.sh stat_done - stat_busy "Loading Keyboard Map: $KEYMAP in utf-8 mode" - /bin/loadkeys -q -u "$KEYMAP" > /dev/null 2>&1 - stat_done + status "Loading Keyboard Map: $KEYMAP in utf-8 mode" /bin/loadkeys -q -u $KEYMAP >/dev/null 2>&1 else - stat_busy "Loading Keyboard Map: $KEYMAP in legacy mode" - /bin/loadkeys -q "$KEYMAP" > /dev/null 2>&1 - stat_done + status "Loading Keyboard Map: $KEYMAP in legacy mode" /bin/loadkeys -q $KEYMAP >/dev/null 2>&1 fi if [ -n "$CONSOLEFONT" ]; then @@ -376,6 +372,9 @@ if [ -n "$CONSOLEFONT" ]; then /usr/bin/setfont $CONSOLEFONT -C /dev/vc/${i} fi done + if [ $? -ne 0 ]; then + stat_fail + fi for i in $(seq 1 63); do echo -ne "\e(K" > /dev/vc/${i} done -- 1.5.3.5