Merge lp:~vorlon/ubiquity/getties-and-ubiquity-dm into lp:ubiquity

[Steve Langasek]

[Steve Langasek (vorlon)]

While an 'only-ubiquity' test worked fine, a 'maybe-ubiquity' test with Ubuntu seems to not be working. OTOH it doesn't look like the current Ubuntu ISO does maybe-ubiquity on its own, from what I can see of the current debian-cd code.

[Steve Langasek (vorlon)]

I re-tested with maybe-ubiquity on Ubuntu, and the previous problem I had seen didn't reproduce - gdm is correctly blocked while the ubiquity service is running. I think that may have been a fluke of me doing something wrt VT switching that broke the ubiquity service at just the right moment, and shouldn't be a blocker for making this change.

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-04 06:36:01 +0000
+++ debian/changelog	2018-04-05 08:44:59 +0000
@@ -1,3 +1,11 @@
+ubiquity (18.04.6) UNRELEASED; urgency=medium
+
+  * Don't block plymouth-quit-wait on the ubiquity greeter; we want ttys to
+    be able to start in parallel for debuggability of ubiquity.  Blocking
+    plymouth-quit is sufficient to ensure ordering.
+
+ -- Steve Langasek <[e-mail]>  Thu, 05 Apr 2018 01:10:34 -0700
+
 ubiquity (18.04.5) bionic; urgency=medium
 
   [ Heber Parruci ]

=== modified file 'debian/ubiquity.ubiquity.service'
--- debian/ubiquity.ubiquity.service	2016-04-18 11:12:16 +0000
+++ debian/ubiquity.ubiquity.service	2018-04-05 08:44:59 +0000
@@ -1,6 +1,6 @@
 [Unit]
 Description=Ubuntu live CD installer
-Before=display-manager.service plymouth-quit.service plymouth-quit-wait.service
+Before=display-manager.service plymouth-quit.service
 
 [Service]
 Type=oneshot