Merge branch 'subiquity-waiting' into ubuntu/master

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.651) UNRELEASED; urgency=medium
+
+  * Do not start subiquity until cloud-final and snapd.seeded have
+    completed.  (LP: #1863887)
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Fri, 06 Mar 2020 13:38:35 +0100
+
 livecd-rootfs (2.650) focal; urgency=medium
 
   * Support generating a .disk/info file via ubuntu-image from the passed-in

live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-subiquity@.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=Subiquity, the installer for Ubuntu Server %I
 BindsTo=dev-%i.device
-After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
+After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service cloud-final.service snapd.seeded.service
 After=rc-local.service
 ConditionPathExists=!/run/subiquity/complete
 StartLimitInterval=0

live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf

@@ -1,6 +1,6 @@
 [Unit]
 IgnoreOnIsolate=yes
-After=systemd-user-sessions.service plymouth-quit-wait.service
+After=systemd-user-sessions.service plymouth-quit-wait.service cloud-final.service snapd.seeded.service
 ConditionPathExists=!/run/subiquity/complete
 
 [Service]