From 00b23f0f6b41c76287d3f62c46983c77bfb0c01f Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 11 Oct 2017 18:24:21 -0400 Subject: [PATCH] Import patches-unapplied version 2.474 to ubuntu/artful-proposed Imported using git-ubuntu import. Changelog parent: 11ad200f2e456379dc328a3b6756d37c421bd7dc New changelog entries: * Fix wrong variable name in systemd unit snippets. --- debian/changelog | 6 ++++++ .../system/snap.subiquity.started.service.d/no-reexec.conf | 2 +- .../etc/systemd/system/snapd.service.d/no-reexec.conf | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bc34871c..77c7f5af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.474) artful; urgency=medium + + * Fix wrong variable name in systemd unit snippets. + + -- Steve Langasek Wed, 11 Oct 2017 18:24:21 -0400 + livecd-rootfs (2.473) artful; urgency=medium [ Balint Reczey ] 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 index 3a073c2d..14a6b477 100644 --- 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 @@ -1,2 +1,2 @@ [Service] -Environment=NO_REEXEC=0 \ No newline at end of file +Environment=SNAP_REEXEC=0 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/etc/systemd/system/snapd.service.d/no-reexec.conf index 3a073c2d..14a6b477 100644 --- 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/etc/systemd/system/snapd.service.d/no-reexec.conf @@ -1,2 +1,2 @@ [Service] -Environment=NO_REEXEC=0 \ No newline at end of file +Environment=SNAP_REEXEC=0