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

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Nov 23 11:28:24 2007
New Revision: 13536

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13536
Log:
  + Use the basename of the contents of 
    /etc/X11/default-display-manager, to allow the user to specify a 
    path by hand. Closes: #452344.

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=13536&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Fri Nov 23 11:28:24 2007
@@ -1,11 +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.
+    + Use the basename of the contents of 
+      /etc/X11/default-display-manager, to allow the user to specify a 
+      path by hand. Closes: #452344.
     + Fix bashims.
 
- -- Josselin Mouette <joss at debian.org>  Fri, 23 Nov 2007 10:15:21 +0100
+ -- Josselin Mouette <joss at debian.org>  Fri, 23 Nov 2007 12:26:36 +0100
 
 gdm (2.20.1-2) unstable; urgency=low
 

Modified: desktop/unstable/gdm/debian/gdm.init
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm.init?rev=13536&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/gdm.init (original)
+++ desktop/unstable/gdm/debian/gdm.init Fri Nov 23 11:28:24 2007
@@ -16,7 +16,6 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/gdm
-DEBCONF_DAEMON=/usr/bin/gdm
 
 test -x $DAEMON || exit 0
 
@@ -34,11 +33,10 @@
 
 case "$1" in
   start)
-        CONFIGURED_DAEMON=$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)
+        CONFIGURED_DAEMON=$(basename $(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
+           [ "$CONFIGURED_DAEMON" != gdm ] ; 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"