r16745 - in /desktop/unstable/gdm/debian: changelog gdm.init

[lool at users.alioth.debian.org]

Author: lool
Date: Sat Aug  9 08:54:55 2008
New Revision: 16745

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16745
Log:
Update init script to honor "text" kernel commandline option by not
  starting gdm if this word is found in /proc/cmdline; taken from Ubuntu
  and added -w flag to grep; LP: #256125.

Modified:
    desktop/unstable/gdm/debian/changelog
    desktop/unstable/gdm/debian/gdm.init

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=16745&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Sat Aug  9 08:54:55 2008
@@ -2,6 +2,9 @@
 
   * Add "status" support to the init script; bump dep on lsb to >= 3.2-14;
     taken from Ubuntu.
+  * Update init script to honor "text" kernel commandline option by not
+    starting gdm if this word is found in /proc/cmdline; taken from Ubuntu
+    and added -w flag to grep; LP: #256125.
 
  -- Loic Minier <lool at dooz.org>  Sun, 03 Aug 2008 18:48:50 +0200
 

Modified: desktop/unstable/gdm/debian/gdm.init
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm.init?rev=16745&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/gdm.init (original)
+++ desktop/unstable/gdm/debian/gdm.init Sat Aug  9 08:54:55 2008
@@ -34,7 +34,9 @@
 case "$1" in
   start)
         CONFIGURED_DAEMON=$(basename "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)")
-        if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \
+        if grep -wqs text /proc/cmdline; then
+            log_warning_msg "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline."
+        elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \
            [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \
            [ "$CONFIGURED_DAEMON" != gdm ] ; then
                 log_action_msg "Not starting GNOME Display Manager; it is not the default display manager"