summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Armstrong <synrg@debian.org>2010-01-31 14:16:57 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:07 +0100
commit6d5c38f8a3584268700602b6119572f5fb2be2fb (patch)
treeceb5490dc7663cc1f2d2ad8a564a6c2dfc55682e
parent9c20c7834babcfd6a3fccaaff3d0ca1d342d60b7 (diff)
downloadlive-boot-6d5c38f8a3584268700602b6119572f5fb2be2fb.tar.gz
live-boot-6d5c38f8a3584268700602b6119572f5fb2be2fb.zip
Use klayout= for layout instead of kbd=.
-rwxr-xr-xscripts/live-bottom/20xconfig7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index f6a3f8d..d06b2d6 100755
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -75,8 +75,13 @@ then
setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}"
fi
+if [ -n "${KLAYOUT}" ]
+then
+ setlayout="set xserver-xorg/config/inputdevice/keyboard/layout ${KLAYOUT}"
+fi
+
chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
-set xserver-xorg/config/inputdevice/keyboard/layout ${kbd}
+${setlayout}
${setvariant}
${setmodel}
${setoptions}