From 6d5c38f8a3584268700602b6119572f5fb2be2fb Mon Sep 17 00:00:00 2001
From: Ben Armstrong <synrg@debian.org>
Date: Sun, 31 Jan 2010 14:16:57 +0100
Subject: [PATCH] Use klayout= for layout instead of kbd=.

---
 scripts/live-bottom/20xconfig | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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}
-- 
2.1.4