From a5a4f4e0d8295becb3a6f485891099c355b83bdc Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 15 Mar 2018 13:22:22 +1300 Subject: [PATCH] * Rename the directory containing the systemd override file for subiquity to the correct name :/ * Add Environment=SNAP_REEXEC=0 to the above override file. * Remove the snap.subiquity.started overrides, that service is long gone. --- debian/changelog | 9 +++++++++ .../snap.subiquity.started.service.d/no-reexec.conf | 3 --- .../overlay/etc/systemd/system/snapd.refresh.timer | 1 - .../subiquity.conf | 1 + .../systemd/system/snapd.service.d/no-reexec.conf | 0 5 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snap.subiquity.started.service.d/no-reexec.conf delete mode 120000 live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snapd.refresh.timer rename live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/{snap.subiquity.subquity-service.d => snap.subiquity.subiquity-service.service.d}/subiquity.conf (91%) rename live-build/ubuntu-server/includes.binary/overlay/{etc => lib}/systemd/system/snapd.service.d/no-reexec.conf (100%) diff --git a/debian/changelog b/debian/changelog index 8089d062..d76c624c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.510) UNRELEASED; urgency=medium + + * Rename the directory containing the systemd override file for subiquity to + the correct name :/ + * Add Environment=SNAP_REEXEC=0 to the above override file. + * Remove the snap.subiquity.started overrides, that service is long gone. + + -- Michael Hudson-Doyle Thu, 15 Mar 2018 13:19:22 +1300 + livecd-rootfs (2.509) bionic; urgency=medium [ Steve Langasek ] diff --git a/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snap.subiquity.started.service.d/no-reexec.conf b/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snap.subiquity.started.service.d/no-reexec.conf deleted file mode 100644 index 52bf88df..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snap.subiquity.started.service.d/no-reexec.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -RemainAfterExit=yes -Environment=SNAP_REEXEC=0 diff --git a/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snapd.refresh.timer b/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snapd.refresh.timer deleted file mode 120000 index dc1dc0cd..00000000 --- a/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snapd.refresh.timer +++ /dev/null @@ -1 +0,0 @@ -/dev/null \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subquity-service.d/subiquity.conf b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf similarity index 91% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subquity-service.d/subiquity.conf rename to live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf index 9ae26356..f5da92cd 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subquity-service.d/subiquity.conf +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf @@ -4,6 +4,7 @@ After=systemd-user-sessions.service plymouth-quit-wait.service ConditionPathExists=!/run/subiquity/complete [Service] +Environment=SNAP_REEXEC=0 UtmpIdentifier=tty1 TTYPath=/dev/tty1 TTYReset=yes diff --git a/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snapd.service.d/no-reexec.conf b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snapd.service.d/no-reexec.conf similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snapd.service.d/no-reexec.conf rename to live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snapd.service.d/no-reexec.conf