From aaef53af49f57c7feccb7ed2eb4297e730d0e7a6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Thu, 4 Oct 2007 08:43:54 +0200
Subject: Merging casper 1.107.

---
 scripts/live-bottom/20xconfig | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'scripts/live-bottom/20xconfig')

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
 
-- 
cgit v1.2.3