Allow snapd to re-exec in installer environment (the issues between snapd, overlayfs and apparmer that meant re-execing caused problems were fixed in snapd a long time ago).

5 days ago · c17a99bc1f
parent 0c5b7dfd0c
commit c17a99bc1f
8 changed files with 6 additions and 10 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,7 +1,13 @@
 livecd-rootfs (25.04.11) UNRELEASED; urgency=medium
  [ Heinrich Schuchardt ]
  * riscv: copy device trees dtb/ in ESP
  [ Michael Hudson-Doyle ]
  * Allow snapd to re-exec in installer environment (the issues between snapd,
    overlayfs and apparmer that meant re-execing caused problems were fixed in
    snapd a long time ago).
 -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com>  Mon, 27 Jan 2025 13:42:35 +0100
 livecd-rootfs (25.04.10) plucky; urgency=medium
--- a/live-build/ubuntu-core-installer/includes.chroot.base.live/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf
+++ b/live-build/ubuntu-core-installer/includes.chroot.base.live/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf
@ -3,6 +3,5 @@ Description=Subiquity, the installer for Ubuntu Server %I
 StartLimitInterval=0
 [Service]
 Environment=SNAP_REEXEC=0
 ExecStart=
 ExecStart=/usr/bin/snap run subiquity.subiquity-service %I
--- a/live-build/ubuntu-core-installer/includes.chroot.base.live/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf
+++ b/live-build/ubuntu-core-installer/includes.chroot.base.live/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf
@ -2,7 +2,6 @@
 IgnoreOnIsolate=yes
 [Service]
 Environment=SNAP_REEXEC=0
 UtmpIdentifier=tty1
 TTYPath=/dev/tty1
 TTYReset=yes
--- a/live-build/ubuntu-core-installer/includes.chroot.base.live/usr/lib/systemd/system/snapd.service.d/no-reexec.conf
+++ b/live-build/ubuntu-core-installer/includes.chroot.base.live/usr/lib/systemd/system/snapd.service.d/no-reexec.conf
@ -1,2 +0,0 @@
 [Service]
 Environment=SNAP_REEXEC=0
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf
+++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf
@ -3,6 +3,5 @@ Description=Subiquity, the installer for Ubuntu Server %I
 StartLimitInterval=0
 [Service]
 Environment=SNAP_REEXEC=0
 ExecStart=
 ExecStart=/usr/bin/snap run subiquity.subiquity-service %I
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf
+++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf
@ -2,7 +2,6 @@
 IgnoreOnIsolate=yes
 [Service]
 Environment=SNAP_REEXEC=0
 UtmpIdentifier=tty1
 TTYPath=/dev/tty1
 TTYReset=yes
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/snapd.service.d/no-reexec.conf
+++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/snapd.service.d/no-reexec.conf
@ -1,2 +0,0 @@
 [Service]
 Environment=SNAP_REEXEC=0
--- a/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/snapd.service.d/no-reexec.conf
+++ b/live-build/ubuntu/includes.chroot.minimal.standard.live/usr/lib/systemd/system/snapd.service.d/no-reexec.conf
@ -1,2 +0,0 @@
 [Service]
 Environment=SNAP_REEXEC=0