summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-08-14 00:59:42 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:01 +0100
commita1311a56603a95bfc642adba1390882591c12c9f (patch)
tree9525beb1384034ddf232f67f142967284fc5ab1e
parentc6045b53fc6b53b69a80955b1555445a07ec9130 (diff)
downloadlive-boot-a1311a56603a95bfc642adba1390882591c12c9f.tar.gz
live-boot-a1311a56603a95bfc642adba1390882591c12c9f.zip
Don't configure X.org if it's not installed.
-rwxr-xr-xscripts/live-bottom/21xdriver5
-rwxr-xr-xscripts/live-bottom/21xvidemode5
2 files changed, 10 insertions, 0 deletions
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"