X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F20xconfig;h=d06b2d670a4fb6342f96047ccd0734ccafb8a424;hb=30d8972aa25fd49dd01aa042155a48bd49c0ae2d;hp=947b7ecb8a1b1bc495accc0e24126d7db9a7f444;hpb=e0a050e3bcf51cf0bb1df9490487e0619d4aa9f9;p=live-boot-grml.git

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 947b7ec..d06b2d6 100755
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -75,14 +75,19 @@ 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}
 EOF
 
-DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg 2>&1 \
+live-reconfigure /root xserver-xorg 2>&1 \
 	| grep -v "overwriting possibly-customised configuration" \
 	| grep -v "file; backup in /etc/X11/xorg.conf"
 umount /root/sys