From 240c6e45ba7c18aafe10275d349144d783b7defe Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 12 Sep 2011 19:26:19 +0200 Subject: [PATCH] Revert "setxkbmap: start init scripts on RUNLEVEL=boot" This reverts commit c139293fb3a967a65bba6fd30aee6fe9e0ce2e2d. --- packages/x11/app/setxkbmap/init.d/72_keyboard | 39 ++++++++----------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/packages/x11/app/setxkbmap/init.d/72_keyboard b/packages/x11/app/setxkbmap/init.d/72_keyboard index c9887eede6..351f8875e0 100644 --- a/packages/x11/app/setxkbmap/init.d/72_keyboard +++ b/packages/x11/app/setxkbmap/init.d/72_keyboard @@ -22,31 +22,24 @@ # # runlevels: openelec -case $RUNLEVEL in - boot) - ( - if [ -f /var/config/settings.conf ]; then - . /var/config/settings.conf +( + if [ -f /var/config/settings.conf ]; then + . /var/config/settings.conf - progress "setup keyboard layout" + progress "setup keyboard layout" - if [ -z $X11_KEYMAP ]; then - X11_KEYMAP="us" - fi + if [ -z $X11_KEYMAP ]; then + X11_KEYMAP="us" + fi - # waiting for Xorg to start - wait_for_xorg + # waiting for Xorg to start + wait_for_xorg - # setup keymap - if [ -z $X11_KEYMAP2 ]; then - setxkbmap -display $DISPLAY $X11_KEYMAP; - else - setxkbmap -display $DISPLAY -layout "$X11_KEYMAP,$X11_KEYMAP2" -option "grp:alt_shift_toggle"; - fi + # setup keymap + if [ -z $X11_KEYMAP2 ]; then + setxkbmap -display $DISPLAY $X11_KEYMAP; + else + setxkbmap -display $DISPLAY -layout "$X11_KEYMAP,$X11_KEYMAP2" -option "grp:alt_shift_toggle"; fi - )& - ;; - - poweroff|reboot) - ;; -esac + fi +)&