Merging casper 1.199.

[live-boot-grml.git] / scripts / live-bottom / 20xconfig

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 2a24ab5..d06b2d6 100755 (executable)
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -27,8 +27,6 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Configuring X"
-
 # live-initramfs script
 
 if [ "${TERM_TYPE}" = "serial" ]
@@ -43,11 +41,18 @@ then
        exit 0
 fi
 
+if [ ! -x /root/usr/bin/X ]
+then
+       exit 0
+fi
+
+log_begin_msg "Configuring X"
+
 locale=en_US.UTF-8
 
-mount -n -o bind /sys /root/sys
-mount -n -o bind /proc /root/proc
-mount -n -o bind /dev /root/dev
+mount -o bind /sys /root/sys
+mount -o bind /proc /root/proc
+mount -o bind /dev /root/dev
 
 if [ -n "${XDEBCONF}" -a -x /root/usr/sbin/xdebconfigurator ]
 then
@@ -70,15 +75,21 @@ 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 \
-       grep -v "overwriting possibly-customised configuration file"
+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
 umount /root/proc
 umount /root/dev