X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F20xconfig;h=c06a505f6e13a6e776af5e030d6a6126557add06;hb=b3300cc6dd1245c6369c6a93be6541c9ae9849c8;hp=8886af8228067bd2b0ff9f2a6763afb1d34798bf;hpb=64af8a933cdcb85e25ccce3771554df22450372d;p=live-boot-grml.git

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 8886af8..c06a505 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,6 +41,13 @@ 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
@@ -77,7 +82,8 @@ ${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 file"
 umount /root/sys
 umount /root/proc
 umount /root/dev