[SCM] live-initramfs branch, master, updated. debian/1.157.4-2-37-ga19352d

[Daniel Baumann]

The following commit has been merged in the master branch:
commit a19352d66d74c9e9b93d0a52e3e946986ea4e9ff
Author: Ben Armstrong <synrg at debian.org>
Date:   Sun Jan 31 14:16:57 2010 +0100

    Use klayout= for layout instead of kbd=.

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}

-- 
live-initramfs