r41761 - in /desktop/experimental/gdm3/debian: changelog gdm3.init

[bigon at users.alioth.debian.org]

Author: bigon
Date: Tue May 20 20:14:18 2014
New Revision: 41761

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41761
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/experimental/gdm3/debian/changelog
    desktop/experimental/gdm3/debian/gdm3.init

Modified: desktop/experimental/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/changelog?rev=41761&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog	[utf-8] Tue May 20 20:14:18 2014
@@ -2,8 +2,10 @@
 
   * Remove kfreebsd-any from Architecture. (Closes: #602724, #601106,
     #612157, #733546)
-
- -- Laurent Bigonville <bigon at debian.org>  Mon, 12 May 2014 23:28:17 +0200
+  * 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 22:09:51 +0200
 
 gdm3 (3.12.1-1) experimental; urgency=medium
 

Modified: desktop/experimental/gdm3/debian/gdm3.init
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.init?rev=41761&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.init	[utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.init	[utf-8] Tue May 20 20:14:18 2014
@@ -32,6 +32,16 @@
 HEED_DEFAULT_DISPLAY_MANAGER=true
 DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 
+activate_logind() {
+  # Try to dbus activate logind to avoid a race conditions if we are not
+  # running systemd as PID1 and we have systemd << 204 package installed (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)")
@@ -43,6 +53,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
                 /usr/share/gdm/generate-config
                 start-stop-daemon --start --quiet --pidfile $PIDFILE \
 			--background --exec $DAEMON || log_end_msg 1