diff options
author | Eric Hameleers <alien@slackware.com> | 2016-01-10 13:39:58 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2016-01-10 13:39:58 +0100 |
commit | 517c42b8aa7ef23d2f897aeb1e840dc0dca8d673 (patch) | |
tree | 2c881803aefb0935477ffb90dd1b07eb7cc640cf /liveinit | |
parent | cea6043290fb411ad7c693007e4f62fc8687a02d (diff) | |
download | liveslak-517c42b8aa7ef23d2f897aeb1e840dc0dca8d673.tar.gz liveslak-517c42b8aa7ef23d2f897aeb1e840dc0dca8d673.tar.xz |
Fix X keyboard configuration if no custom layout was chosen at boot.
Diffstat (limited to 'liveinit')
-rwxr-xr-x | liveinit | 22 |
1 files changed, 12 insertions, 10 deletions
@@ -404,15 +404,18 @@ EOT XKBLAYOUT="$(echo $KEYMAP |cut -c1-2)" fi fi - echo "${INITRD}: Switching live X desktop to '$XKBLAYOUT' keyboard" - # If the layout is not 'us' then add 'us' as a secondary nevertheless: - if [ "$XKBLAYOUT" != "us" ]; then - XKBLAYOUT="$XKBLAYOUT,us" - XKBVARIANT="$XKBVARIANT," - XKBOPTIONS="grp:alt_shift_toggle,$XKBOPTIONS" - fi - mkdir -p /mnt/overlay/etc/X11/xorg.conf.d - cat <<EOT > /mnt/overlay/etc/X11/xorg.conf.d/30-keyboard.conf + else + XKBLAYOUT="us" + fi + echo "${INITRD}: Switching live X desktop to '$XKBLAYOUT' keyboard" + # If the layout is not 'us' then add 'us' as a secondary nevertheless: + if [ "$XKBLAYOUT" != "us" ]; then + XKBLAYOUT="$XKBLAYOUT,us" + XKBVARIANT="$XKBVARIANT," + XKBOPTIONS="grp:alt_shift_toggle,$XKBOPTIONS" + fi + mkdir -p /mnt/overlay/etc/X11/xorg.conf.d + cat <<EOT > /mnt/overlay/etc/X11/xorg.conf.d/30-keyboard.conf Section "InputClass" Identifier "keyboard-all" Driver "evdev" @@ -422,7 +425,6 @@ Section "InputClass" MatchIsKeyboard "on" EndSection EOT - fi if [ ! -z "$LOCALE" ]; then # Configure custom locale: |