summaryrefslogtreecommitdiff
path: root/scripts/live-bottom/20xconfig
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-10-04 08:43:54 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:31:05 +0100
commitaaef53af49f57c7feccb7ed2eb4297e730d0e7a6 (patch)
tree128582e574d2a8e580cc424afd1179ea46b14b1f /scripts/live-bottom/20xconfig
parent7a89bfb777121ee55d870ffe605c6f553d26a7c9 (diff)
downloadlive-boot-aaef53af49f57c7feccb7ed2eb4297e730d0e7a6.tar.gz
live-boot-aaef53af49f57c7feccb7ed2eb4297e730d0e7a6.zip
Merging casper 1.107.
Diffstat (limited to 'scripts/live-bottom/20xconfig')
-rwxr-xr-xscripts/live-bottom/20xconfig7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
index 8d315a5..779a1c2 100755
--- a/scripts/live-bottom/20xconfig
+++ b/scripts/live-bottom/20xconfig
@@ -34,7 +34,12 @@ log_begin_msg "Configuring X..."
if [ "${TERM_TYPE}" = "serial" ]
then
# Don't bother trying to configure or start X on a serial console
- rm -f /etc/rc?.d/S??[gxk]dm
+ rm -f /root/etc/rc?.d/S??[gkx]dm
+ exit 0
+fi
+
+if [ -n "${TEXTONLY}" ]
+then
exit 0
fi