r40276 - in /desktop/unstable/gnome-shell/debian: changelog patches/41-handle-logind-fail.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Nov 21 08:14:56 2013
New Revision: 40276

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40276
Log:
* debian/patches/41-handle-logind-fail.patch:
  + Gracefully handle logind not creating our session by falling back
    to ConsoleKit. This can happen when running on a kernel without
    cgroups support. Closes: #729877.

Added:
    desktop/unstable/gnome-shell/debian/patches/41-handle-logind-fail.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/series

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=40276&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog	[utf-8] Thu Nov 21 08:14:56 2013
@@ -1,3 +1,12 @@
+gnome-shell (3.8.4-5) unstable; urgency=low
+
+  * debian/patches/41-handle-logind-fail.patch:
+    + Gracefully handle logind not creating our session by falling back
+      to ConsoleKit. This can happen when running on a kernel without
+      cgroups support. Closes: #729877.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 18 Nov 2013 21:00:59 +0100
+
 gnome-shell (3.8.4-4) unstable; urgency=low
 
   [ Petr Salinger ]

Added: desktop/unstable/gnome-shell/debian/patches/41-handle-logind-fail.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/41-handle-logind-fail.patch?rev=40276&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/41-handle-logind-fail.patch	(added)
+++ desktop/unstable/gnome-shell/debian/patches/41-handle-logind-fail.patch	[utf-8] Thu Nov 21 08:14:56 2013
@@ -0,0 +1,22 @@
+Author: Emilio Pozuelo Monfort <pochu at debian.org>
+
+Even if logind is running (which is what haveSystemd() is checking), it may
+fail to create a session, e.g. if the kernel doesn't have cgroups support.
+
+If that's the case, XDG_SESSION_ID will not be set and we will fail to
+start. Thus talk to logind if XDG_SESSION_ID is set, which is a sign that
+logind actually created our session. Otherwise, fall back to ConsoleKit.
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=729877
+
+--- a/js/misc/loginManager.js
++++ b/js/misc/loginManager.js
+@@ -117,7 +117,7 @@
+  */
+ function getLoginManager() {
+     if (_loginManager == null) {
+-        if (haveSystemd())
++        if (haveSystemd() && GLib.getenv('XDG_SESSION_ID'))
+             _loginManager = new LoginManagerSystemd();
+         else
+             _loginManager = new LoginManagerConsoleKit();

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=40276&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series	[utf-8] Thu Nov 21 08:14:56 2013
@@ -3,5 +3,6 @@
 27-nm-libexec-path.patch
 #30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
 40_change-pam-name-to-match-gdm.patch
+41-handle-logind-fail.patch
 revert-suspend-break.patch
 git_relock_screen_after_crash.patch