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

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 902335e..2a24ab5 100755
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -27,14 +27,19 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Configuring X..."
+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
 
@@ -50,30 +55,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 +77,8 @@ ${setmodel}
 ${setoptions}
 EOF
 
-fi
-
-DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg
+DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg 2>&1 \
+	grep -v "overwriting possibly-customised configuration file"
 umount /root/sys
 umount /root/proc
 umount /root/dev