From: Chris Lamb <chris@chris-lamb.co.uk>
Date: Wed, 13 Aug 2008 23:59:42 +0000 (+0100)
Subject: Don't configure X.org if it's not installed.
X-Git-Tag: debian/2.0.15-1~461
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=a1311a56603a95bfc642adba1390882591c12c9f;p=live-boot-grml.git

Don't configure X.org if it's not installed.
---

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"