r44155 - in /desktop/unstable/gdm3/debian: changelog patches/96_plymouth-quit.patch patches/series

[smcv at users.alioth.debian.org]

Author: smcv
Date: Wed Mar 11 18:27:40 2015
New Revision: 44155

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44155
Log:
* Team upload.
* Under systemd, if gdm fails to start, or if the selected DM is
  kdm or wdm, make sure to run plymouth-quit.service (which gdm normally
  suppresses), so that plymouth-quit-wait.service terminates and gettys
  are not prevented from running. (Closes: #766462, #780257)

Added:
    desktop/unstable/gdm3/debian/patches/96_plymouth-quit.patch
Modified:
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/series

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=44155&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog	[utf-8] Wed Mar 11 18:27:40 2015
@@ -1,3 +1,13 @@
+gdm3 (3.14.1-6) unstable; urgency=medium
+
+  * Team upload.
+  * Under systemd, if gdm fails to start, or if the selected DM is
+    kdm or wdm, make sure to run plymouth-quit.service (which gdm normally
+    suppresses), so that plymouth-quit-wait.service terminates and gettys
+    are not prevented from running. (Closes: #766462, #780257)
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 11 Mar 2015 12:25:38 +0000
+
 gdm3 (3.14.1-5) unstable; urgency=medium
 
   * Do not fail to start gdm if /etc/default/locale does not exist

Added: desktop/unstable/gdm3/debian/patches/96_plymouth-quit.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/96_plymouth-quit.patch?rev=44155&op=file
==============================================================================
--- desktop/unstable/gdm3/debian/patches/96_plymouth-quit.patch	(added)
+++ desktop/unstable/gdm3/debian/patches/96_plymouth-quit.patch	[utf-8] Wed Mar 11 18:27:40 2015
@@ -0,0 +1,38 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Wed, 11 Mar 2015 11:35:40 +0000
+Subject: systemd: call plymouth-quit if gdm fails
+
+gdm.service Conflicts with plymouth-quit.service, so it does not run
+when it normally would (because GDM wants to handle the handover from
+plymouth to X11 itself). This means that if gdm fails to start for whatever
+reason, plymouth is never stopped, so plymouth-quit-wait.service
+never finishes. This, in turn, means that getty at tty*.service, which is
+After plymouth-wait-quit.service, never starts, and there is no way to
+log in locally and fix the problem (Debian bug #780257, but not
+Debian-specific).
+
+In Debian 8, not all display managers have been migrated to
+participate in managing the display-manager.service symlink yet
+(in particular, kdm and wdm have not), so gdm has a transitional
+ExecStartPre that stops it from running if kdm or wdm is selected
+as the active DM. This has the same effect of preventing plymouth
+from running (Debian-specific bug #766462).
+
+It's easy to avoid both of those situations by scheduling
+plymouth-quit.service to run if gdm fails.
+
+Bug-Debian: https://bugs.debian.org/766462
+Bug-Debian: https://bugs.debian.org/780257
+
+--- a/data/gdm.service.in
++++ b/data/gdm.service.in
+@@ -2,6 +2,9 @@
+ Description=GNOME Display Manager
+ Conflicts=getty at tty@GDM_INITIAL_VT at .service plymouth-quit.service
+ After=systemd-user-sessions.service getty at tty@GDM_INITIAL_VT at .service plymouth-quit.service
++# GDM takes responsibility for stopping plymouth, so if it fails
++# for any reason, make sure plymouth still stops
++OnFailure=plymouth-quit.service
+ 
+ [Service]
+ ExecStartPre=/bin/sh -c '[ "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/usr/sbin/gdm3" ]'

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=44155&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series	[utf-8] Wed Mar 11 18:27:40 2015
@@ -10,3 +10,4 @@
 93_disable_gvfs.patch
 94_retain_xorg_log.patch
 95_systemd-import-language-into-daemon-environment.patch
+96_plymouth-quit.patch