From 6e68a3f13ceee1176339e87e80c38152c52c26bb Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 6 Mar 2020 11:57:41 +0100 Subject: [PATCH] Do not start subiquity until cloud-final and snapd.seeded have completed. --- debian/changelog | 7 +++++++ .../usr/lib/systemd/system/serial-subiquity@.service | 2 +- .../subiquity.conf | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d21bad2a..94f34408 100644 --- a/debian/changelog +++ b/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. + + -- Michael Hudson-Doyle 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 diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-subiquity@.service b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-subiquity@.service index c291c3d2..cf1d32f7 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-subiquity@.service +++ b/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 diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf index f5da92cd..99639b7b 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf +++ b/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]