From 5a3ccfef341d527c982edf3af372266b3b1be566 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 10 Oct 2017 18:41:01 -0400 Subject: [PATCH] Import patches-unapplied version 2.472 to ubuntu/artful-proposed Imported using git-ubuntu import. Changelog parent: 84ef6ff8e3e67562bf44191ec9b0c3da4237b4ff New changelog entries: [ Michael Hudson-Doyle ] * Add snap.subiquity.started.service to subiquity.service's Requires=. --- debian/changelog | 7 +++++++ .../overlay/lib/systemd/system/subiquity.service | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ff6590da..4c37756c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.472) artful; urgency=medium + + [ Michael Hudson-Doyle ] + * Add snap.subiquity.started.service to subiquity.service's Requires=. + + -- Steve Langasek Tue, 10 Oct 2017 18:41:01 -0400 + livecd-rootfs (2.471) artful; urgency=medium * Now that grub-related diversions have been factored out in 2.466 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 7baf00fa..be4e1c54 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 @@ -2,7 +2,7 @@ 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 +Requires=snapd.service snap.subiquity.started.service IgnoreOnIsolate=yes ConditionPathExists=/dev/tty0 ConditionPathExists=!/run/subiquity/complete