From 857f1984c9a9e4e32bc87ea2b3f3c44ce3dd2f19 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 11 Oct 2017 12:46:10 -0400 Subject: [PATCH] export SNAP_REEXEC=0 to our snappy systemd units in the livefs overlay, to work around apparmor not working reliably against aufs. --- debian/changelog | 5 +++++ .../system/snap.subiquity.started.service.d/no-reexec.conf | 2 ++ .../etc/systemd/system/snapd.service.d/no-reexec.conf | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snap.subiquity.started.service.d/no-reexec.conf create mode 100644 live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snapd.service.d/no-reexec.conf diff --git a/debian/changelog b/debian/changelog index fcdaf282..1112bcc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,15 @@ livecd-rootfs (2.473) UNRELEASED; urgency=medium + [ Balint Reczey ] * Clean up dangling /boot/initrd.img symlink when needed * Revert ignoring failure of minimized autopkgtest on ppc64el * Use kvm kernel only on amd64 * Skip installing server task when building minimial images + [ Steve Langasek ] + * export SNAP_REEXEC=0 to our snappy systemd units in the livefs overlay, + to work around apparmor not working reliably against aufs. + -- Balint Reczey Wed, 11 Oct 2017 01:58:39 +0200 livecd-rootfs (2.472) artful; urgency=medium 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 new file mode 100644 index 00000000..3a073c2d --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snap.subiquity.started.service.d/no-reexec.conf @@ -0,0 +1,2 @@ +[Service] +Environment=NO_REEXEC=0 \ No newline at end of file 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 new file mode 100644 index 00000000..3a073c2d --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snapd.service.d/no-reexec.conf @@ -0,0 +1,2 @@ +[Service] +Environment=NO_REEXEC=0 \ No newline at end of file