setxkbmap: init: update for new settings addon

This commit is contained in:
Stefan Saraev 2013-03-18 16:35:13 +02:00
parent 1b372847b8
commit a0d481efb9

View File

@ -23,23 +23,15 @@
# runlevels: openelec
(
if [ -f /var/config/settings.conf ]; then
. /var/config/settings.conf
if [ -f /storage/.cache/xkb/layout ]; then
. /storage/.cache/xkb/layout
progress "setup keyboard layout"
if [ -z $X11_KEYMAP ]; then
X11_KEYMAP="us"
fi
# 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
setxkbmap -display $DISPLAY -layout "$XKBLAYOUT" -model "$XKBMODEL" -option "grp:alt_shift_toggle";
fi
)&