[SCM] debian-live branch, master, updated. 1.136.3-1-32-g3f5a329

[Chris Lamb]

The following commit has been merged in the master branch:
commit 53b33ecdf81d31bac4782089fe6e81fcbfe7d007
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Tue Aug 12 01:09:36 2008 +0100

    Don't configure X when /usr/bin/X does not exist.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 2a24ab5..4a80b21 100755
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -43,6 +43,11 @@ then
 	exit 0
 fi
 
+if [ -x /root/usr/bin/X ]
+then
+	exit 0
+fi
+
 locale=en_US.UTF-8
 
 mount -n -o bind /sys /root/sys

-- 
debian-live