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

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Nov 23 09:23:49 2007
New Revision: 13534

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13534
Log:
* debian/gdm.init:
  + Allow the user to set /usr/sbin/gdm in 
    /etc/X11/default-display-manager by hand. Closes: #452344.
  + Fix bashims.

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=13534&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Fri Nov 23 09:23:49 2007
@@ -1,3 +1,12 @@
+gdm (2.20.1-3) UNRELEASED; urgency=low
+
+  * debian/gdm.init:
+    + Allow the user to set /usr/sbin/gdm in 
+      /etc/X11/default-display-manager by hand. Closes: #452344.
+    + Fix bashims.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 23 Nov 2007 10:15:21 +0100
+
 gdm (2.20.1-2) unstable; urgency=low
 
   * debian/patches/67_dont_use_LC_CTYPE_for_GDMLANG.patch:

Modified: desktop/unstable/gdm/debian/gdm.init
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm.init?rev=13534&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/gdm.init (original)
+++ desktop/unstable/gdm/debian/gdm.init Fri Nov 23 09:23:49 2007
@@ -34,7 +34,11 @@
 
 case "$1" in
   start)
-        if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" -a "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" -a "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)" != "$DEBCONF_DAEMON" ]; then
+        CONFIGURED_DAEMON=$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)
+        if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \
+           [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \
+           [ "$CONFIGURED_DAEMON" != "$DEBCONF_DAEMON" ] && \
+           [ "$CONFIGURED_DAEMON" != "$DAEMON" ] ; then
                 log_action_msg "Not starting GNOME Display Manager; it is not the default display manager"
         else
                 log_daemon_msg "Starting GNOME Display Manager" "gdm"