X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F20xconfig;h=947b7ecb8a1b1bc495accc0e24126d7db9a7f444;hb=a8b795f00da8ab5952ef11f1f4ef170d47591c98;hp=e2afe7841f0024a8c53a43c83d51d873dc12379a;hpb=5f0f3b0c36d433a462176f970d371c77c3020749;p=live-boot-grml.git

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index e2afe78..947b7ec 100755
--- 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
@@ -77,7 +82,9 @@ ${setmodel}
 ${setoptions}
 EOF
 
-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" \
+	| grep -v "file; backup in /etc/X11/xorg.conf"
 umount /root/sys
 umount /root/proc
 umount /root/dev