← Back to branch summary

~ubuntu-branches/debian/stretch/lightdm/stretch

« back to all changes in this revision

Viewing changes to debian/patches/03_quit-plymouth.patch

  • Committer: Package Import Robot
  • Author(s): Yves-Alexis Perez
  • Date: 2014-10-09 13:01:51 UTC
  • mfrom: (1.1.26)
  • Revision ID: package-import@ubuntu.com-20141009130151-2hph9uitw2ygq86s
Tags: 1.10.3-1
* New upstream release.
* debian/patches:
  - 04_fix-double-free-configuration-key-source dropped, included upstream.
* debian/upstream/signing-key.asc added, add PGP key for Robert Ancell
  (0x18EAA1890F7C882E).
* debian/watch updated, add mangle option to check PGP signatures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/03_quit-plymouth.patch
1
 
Author: Yves-Alexis Perez <corsac@debian.org>
2
 
Description: quit plymouth instead of deactivating it
3
 
plymouth is quitted from the /etc/init.d/plymouth script, but it'll hang if
4
 
plymouth has been deactivated before, so just quit it for now.
5
 
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632737
6
 
Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/799069
7
 
--- a/src/xserver-local.c
8
 
+++ b/src/xserver-local.c
9
 
@@ -142,7 +142,7 @@ xserver_local_new (void)
10
 
             g_debug ("X server %s will replace Plymouth", xserver_get_address (XSERVER (self)));
11
 
             self->priv->replacing_plymouth = TRUE;
12
 
             self->priv->vt = active_vt;
13
 
-            plymouth_deactivate ();
14
 
+            plymouth_quit (FALSE);
15
 
         }
16
 
         else
17
 
             g_debug ("Plymouth is running on VT %d, but this is less than the configured minimum of %d so not replacing it", active_vt, vt_get_min ());