X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F20xconfig;h=f6a3f8d58c67b5c7ddcda0763f6e271fde69da1c;hb=170a01e0a2064de0d5a5fdee79611c7886d1554c;hp=902335e469c68ec862d5bda8454cc3f9605f5eda;hpb=cb896241d0ec8eb2bba0cecd11de3500869176a6;p=live-boot-grml.git

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 902335e..f6a3f8d 100755
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -27,22 +27,32 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Configuring X..."
-
 # live-initramfs script
 
-if [ "$TERM_TYPE" = "serial" ]
+if [ "${TERM_TYPE}" = "serial" ]
 then
 	# Don't bother trying to configure or start X on a serial console
-	rm -f /etc/rc?.d/S??[gxk]dm
+	rm -f /root/etc/rc?.d/S??[gkx]dm
+	exit 0
+fi
+
+if [ -n "${TEXTONLY}" ]
+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
@@ -50,30 +60,20 @@ then
 	chroot /root /usr/sbin/xdebconfigurator
 fi
 
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
+if [ -n "${KOPTIONS}" ]
 then
+	setoptions="set xserver-xorg/config/inputdevice/keyboard/options ${KOPTIONS}"
+fi
 
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
-set xserver-xorg/autodetect_keyboard true
-fset xserver-xorg/autodetect_keyboard seen true
-EOF
-
-else
-	# d-i code not present, so:
-	if [ -n "${KOPTIONS}" ]
-	then
-		setoptions="set xserver-xorg/config/inputdevice/keyboard/options ${KOPTIONS}"
-	fi
-
-	if [ -n "${KVARIANT}" ]
-	then
-		setvariant="set xserver-xorg/config/inputdevice/keyboard/variant ${KVARIANT}"
-	fi
+if [ -n "${KVARIANT}" ]
+then
+	setvariant="set xserver-xorg/config/inputdevice/keyboard/variant ${KVARIANT}"
+fi
 
-	if [ -n "${KMODEL}" ]
-	then
-		setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}"
-	fi
+if [ -n "${KMODEL}" ]
+then
+	setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}"
+fi
 
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
 set xserver-xorg/config/inputdevice/keyboard/layout ${kbd}
@@ -82,9 +82,9 @@ ${setmodel}
 ${setoptions}
 EOF
 
-fi
-
-DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg
+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