r41757 - in /desktop/unstable/gdm3/debian: changelog gdm3.init

[bigon at users.alioth.debian.org]

Author: bigon
Date: Tue May 20 19:29:31 2014
New Revision: 41757

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41757
Log:
debian/gdm3.init: Try to activate logind before starting gdm to avoid a
race condition when systemd is not used as PID1 (Closes: #747210)

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

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=41757&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog	[utf-8] Tue May 20 19:29:31 2014
@@ -1,3 +1,10 @@
+gdm3 (3.8.4-9) UNRELEASED; urgency=medium
+
+  * debian/gdm3.init: Try to activate logind before starting gdm to avoid a
+    race condition when systemd is not used as PID1 (Closes: #747210)
+
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 20 May 2014 21:23:57 +0200
+
 gdm3 (3.8.4-8.1) unstable; urgency=medium
 
   * Non-maintainer upload.

Modified: desktop/unstable/gdm3/debian/gdm3.init
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/gdm3.init?rev=41757&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/gdm3.init	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/gdm3.init	[utf-8] Tue May 20 19:29:31 2014
@@ -63,6 +63,15 @@
   fi
 }
 
+activate_logind() {
+  # Try to dbus activate logind if we are not running systemd as PID1 and
+  # we have systemd << 204 package installed to avoid race conditions (see: #747292)
+  if [ ! -d /run/systemd/system ] && [ -x /lib/systemd/systemd-logind-launch ]; then
+    dbus-send --system --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus \
+      org.freedesktop.DBus.StartServiceByName string:org.freedesktop.login1 uint32:0 2>&1 > /dev/null
+  fi
+}
+
 case "$1" in
   start)
         CONFIGURED_DAEMON=$(basename "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)")
@@ -74,6 +83,7 @@
                 log_action_msg "Not starting GNOME Display Manager; it is not the default display manager"
         else
                 log_daemon_msg "Starting GNOME Display Manager" "gdm3"
+                activate_logind || log_end_msg 1
                 gen_config
                 rm -f /var/lib/gdm/.ICEauthority
                 start-stop-daemon --start --quiet --pidfile /var/run/gdm3.pid \