Bug#655753: [PATCH/RFC] xdm.init: do not start if "text" option is in kernel commandline

[Jonathan Nieder]

Package: xdm
Version: 1:1.1.11-1
Severity: wishlist
Tags: patch

Hi,

Since two years ago (gdm version 2.20.7-2), the gdm and gdm3 packages
have supported a "text" option on the kernel command line to not
automatically start up the display manager at boot.

I would like to be able to point to this option when asking people to
debug in a non-graphical environment.

The following patch has the downside that even an explicit
"/etc/init.d/xdm start" does not start xdm when this option is in
/proc/cmdline.  So I would be happier if there is some better way to
implement this.  Ideas?

Thanks,
Jonathan
---
 debian/changelog |    6 ++++++
 debian/xdm.init  |    3 +++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 993408d5..5112084e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xdm (1:1.1.11-2) UNRELEASED; urgency=low
+
+  * xdm.init: do not start xdm if the word "text" is found in /proc/cmdline.
+
+ -- Jonathan Nieder <jrnieder at gmail.com>  Fri, 13 Jan 2012 14:46:55 -0600
+
 xdm (1:1.1.11-1) unstable; urgency=low
 
   [ Joe Hansen ]
diff --git a/debian/xdm.init b/debian/xdm.init
index 4127dffe..564a4b13 100644
--- a/debian/xdm.init
+++ b/debian/xdm.init
@@ -65,6 +65,9 @@ case "$1" in
        [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then
       echo "Not starting X display manager (xdm); it is not the default" \
         "display manager."
+    elif grep -wqs text /proc/cmdline; then
+      echo "Not starting X display manager (xdm); found 'text' in" \
+        "kernel command line."
     else
       log_daemon_msg "Starting X display manager" "xdm"
       start-stop-daemon --start --quiet $SSD_START_ARGS \
-- 
1.7.8.3