From 895e2a51f152cd4e0c5a19f3afd2848a4138524f Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 18 Oct 2017 13:23:45 +1300 Subject: [PATCH 1/2] Seed the subiquity snap to track the stable channel (LP: #1724410) --- debian/changelog | 7 +++++++ .../ubuntu-server/hooks/032-installer-squashfs.binary | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 72585455..b1e9e9c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.478) UNRELEASED; urgency=medium + + * Two last minute server-live fixes: + - Seed the subiquity snap to track the stable channel (LP: #1724410) + + -- Michael Hudson-Doyle Wed, 18 Oct 2017 13:22:50 +1300 + livecd-rootfs (2.477) artful; urgency=medium * Fix server live image to pull subiquity from the stable channel, not diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary index da2bc3c0..87c743dd 100755 --- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary +++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary @@ -64,7 +64,7 @@ snaps: channel: stable file: ${CORE_SNAP} - name: subiquity - channel: edge + channel: stable classic: true file: ${SUBIQUITY_SNAP} EOF From 1a99680334938255a1991a804727859b5d2631ec Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 18 Oct 2017 13:26:08 +1300 Subject: [PATCH 2/2] Remove snap.subiquity.started from subiquity's After=/Requires= as it does not fix the race condition they were intended to address and causes subiquity to be killed when snapd refreshes subiquity (LP: #1724411) --- debian/changelog | 3 +++ .../overlay/lib/systemd/system/subiquity.service | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b1e9e9c5..d726b3dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ livecd-rootfs (2.478) UNRELEASED; urgency=medium * Two last minute server-live fixes: - Seed the subiquity snap to track the stable channel (LP: #1724410) + - Remove snap.subiquity.started from subiquity's After=/Requires= as it + does not fix the race condition they were intended to address and causes + subiquity to be killed when snapd refreshes subiquity (LP: #1724411) -- Michael Hudson-Doyle Wed, 18 Oct 2017 13:22:50 +1300 diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service index 36df8e1a..89d44bd2 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service @@ -1,8 +1,8 @@ [Unit] Description=Subiquity, the installer for Ubuntu Server After=systemd-user-sessions.service plymouth-quit-wait.service -After=rc-local.service snap.subiquity.started.service -Requires=snapd.service snap.subiquity.started.service +After=rc-local.service +Requires=snapd.service IgnoreOnIsolate=yes ConditionPathExists=/dev/tty0 ConditionPathExists=!/run/subiquity/complete