[SCM] debian-live branch, master, updated. 1.136.3-1-41-g57c11f5

[Chris Lamb]

The following commit has been merged in the master branch:
commit 2e903fb37ea1255486a07f5662687d22d5c43235
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Thu Aug 14 00:59:42 2008 +0100

    Don't configure X.org if it's not installed.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/scripts/live-bottom/21xdriver b/scripts/live-bottom/21xdriver
index 7a16589..075a53e 100755
--- a/scripts/live-bottom/21xdriver
+++ b/scripts/live-bottom/21xdriver
@@ -25,6 +25,11 @@ then
 	exit 0
 fi
 
+if [ ! -x /root/usr/bin/X ]
+then
+	exit 0
+fi
+
 . /scripts/live-functions
 
 log_begin_msg "Configuring X video driver"
diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode
index e1c1d46..24116e9 100755
--- a/scripts/live-bottom/21xvidemode
+++ b/scripts/live-bottom/21xvidemode
@@ -25,6 +25,11 @@ then
 	exit 0
 fi
 
+if [ ! -x /root/usr/bin/X ]
+then
+	exit 0
+fi
+
 . /scripts/live-functions
 
 log_begin_msg "Configuring X video modes"

-- 
debian-live