diff options
| author | Roman Kyrylych <roman@archlinux.org> | 2008-03-06 00:24:20 +0200 |
|---|---|---|
| committer | Roman Kyrylych <roman@archlinux.org> | 2008-03-06 00:27:31 +0200 |
| commit | 91b86efedd70e6b83232057fbf2b089a47b76333 (patch) | |
| tree | 256f50d30b9fda03dce157a80a07cb9e2222d81b /rc.sysinit | |
| parent | 56fffa9954db654c1731e07f753c3de105896455 (diff) | |
| download | initscripts-91b86efedd70e6b83232057fbf2b089a47b76333.tar.xz | |
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 <roman@archlinux.org>
Diffstat (limited to 'rc.sysinit')
| -rwxr-xr-x | rc.sysinit | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |