From cf74474d4beb87246d558ba0f1ac2db61ca5d740 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 10 Oct 2017 18:41:05 -0400 Subject: [PATCH 01/14] releasing package livecd-rootfs version 2.472 --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7d43da42..4c37756c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -livecd-rootfs (2.472) UNRELEASED; urgency=medium +livecd-rootfs (2.472) artful; urgency=medium + [ Michael Hudson-Doyle ] * Add snap.subiquity.started.service to subiquity.service's Requires=. - -- Michael Hudson-Doyle Mon, 09 Oct 2017 15:09:56 +1300 + -- Steve Langasek Tue, 10 Oct 2017 18:41:01 -0400 livecd-rootfs (2.471) artful; urgency=medium From 549232f607d743ba069c435fa56cae36ede0c10b Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Wed, 11 Oct 2017 01:57:03 +0200 Subject: [PATCH 02/14] Clean up dangling /boot/initrd.img symlink when needed --- live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot index e59e38c8..8b22fc8e 100755 --- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot @@ -130,6 +130,11 @@ if [ -f "${rootd}/etc/overlayroot.conf" ] && } > "${rootd}/etc/overlayroot.local.conf" fi +# previous steps may have left a dangling symlink here with +# SUBPROJECT=minimized and that breaks lb_chroot_hacks step +if [ -L "${rootd}/boot/initrd.img" ] && [ ! -e "${rootd}/boot/initrd.img" ]; then + rm "${rootd}/boot/initrd.img" +fi #### END COMMON ARCH FUNCTIONS From d3ef9c62316c95989aa17d0c0d702b8b849e464f Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Wed, 11 Oct 2017 01:57:03 +0200 Subject: [PATCH 03/14] Revert ignoring failure of minimized autopkgtest on ppc64el --- debian/tests/minimized | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/debian/tests/minimized b/debian/tests/minimized index 0807a764..c5da93ee 100644 --- a/debian/tests/minimized +++ b/debian/tests/minimized @@ -1,11 +1,3 @@ #!/bin/sh -ARCH=$(dpkg --print-architecture) - -failure_code=1 -if [ "$ARCH" = ppc64el ]; then - # not a regression; don't block while debugging - failure_code=0 -fi - -env SELECTED_TRIPLETS=ubuntu-cpc:minimized:ubuntu-cpc debian/tests/default-bootstraps || exit $failure_code +env SELECTED_TRIPLETS=ubuntu-cpc:minimized:ubuntu-cpc debian/tests/default-bootstraps From d6bb42bc63a77971184cff91531dc9c0a7de7701 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Wed, 11 Oct 2017 01:57:03 +0200 Subject: [PATCH 04/14] Use kvm kernel only on amd64 --- live-build/auto/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 23880265..d78f6a54 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -540,7 +540,7 @@ case $PROJECT in # linux-kvm is available since you control the # archive and can provide this metapackage as # necessary. - if [ -z "$EXTRA_PPAS" ] && [ "$SUITE" != xenial ]; then + if [ "$ARCH" != "amd64" ] || ([ -z "$EXTRA_PPAS" ] && [ "$SUITE" != xenial ]); then KERNEL_FLAVOURS=virtual else KERNEL_FLAVOURS=kvm From 314655a2ae4763aa96d54782a4e7e78155422f54 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Wed, 11 Oct 2017 01:57:03 +0200 Subject: [PATCH 05/14] Skip installing server task when building minimial images --- live-build/auto/config | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index d78f6a54..bf7435d7 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -549,6 +549,11 @@ case $PROJECT in add_task install minimal standard cloud-image add_package install ubuntu-minimal KERNEL_FLAVOURS=virtual + case $ARCH in + armhf|arm64|ppc64el|powerpc) + add_task install server + ;; + esac fi BINARY_REMOVE_LINUX=false @@ -557,17 +562,9 @@ case $PROJECT in armhf) KERNEL_FLAVOURS=generic-lpae add_package install flash-kernel - add_task install server ;; arm64) add_package install flash-kernel - add_task install server - ;; - ppc64el) - add_task install server - ;; - powerpc) - add_task install server ;; esac OPTS="${OPTS:+$OPTS }--system=normal" From 2e518950c7fc2ca8516f496c2110a0b060ad1371 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Wed, 11 Oct 2017 01:59:06 +0200 Subject: [PATCH 06/14] Update changelog --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4c37756c..fcdaf282 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.473) UNRELEASED; urgency=medium + + * 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 + + -- Balint Reczey Wed, 11 Oct 2017 01:58:39 +0200 + livecd-rootfs (2.472) artful; urgency=medium [ Michael Hudson-Doyle ] From 857f1984c9a9e4e32bc87ea2b3f3c44ce3dd2f19 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 11 Oct 2017 12:46:10 -0400 Subject: [PATCH 07/14] 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 From 16d7a516a8168aea34db9df44988aedd7e9172dd Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 11 Oct 2017 12:46:16 -0400 Subject: [PATCH 08/14] releasing package livecd-rootfs version 2.473 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1112bcc6..bc34871c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.473) UNRELEASED; urgency=medium +livecd-rootfs (2.473) artful; urgency=medium [ Balint Reczey ] * Clean up dangling /boot/initrd.img symlink when needed @@ -10,7 +10,7 @@ livecd-rootfs (2.473) UNRELEASED; urgency=medium * 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 + -- Steve Langasek Wed, 11 Oct 2017 12:46:14 -0400 livecd-rootfs (2.472) artful; urgency=medium From 9f040f048197755296f4497ec4a1208a9349bd94 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 11 Oct 2017 18:24:19 -0400 Subject: [PATCH 09/14] 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..f3865398 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.474) UNRELEASED; urgency=medium + + * Fix wrong variable name in systemd unit snippets. + + -- Steve Langasek Wed, 11 Oct 2017 18:17:14 -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 From 8ab84a0f9f38a201084d2c1cca6a734ad9282c04 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 11 Oct 2017 18:24:24 -0400 Subject: [PATCH 10/14] releasing package livecd-rootfs version 2.474 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f3865398..77c7f5af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (2.474) UNRELEASED; urgency=medium +livecd-rootfs (2.474) artful; urgency=medium * Fix wrong variable name in systemd unit snippets. - -- Steve Langasek Wed, 11 Oct 2017 18:17:14 -0400 + -- Steve Langasek Wed, 11 Oct 2017 18:24:21 -0400 livecd-rootfs (2.473) artful; urgency=medium From f58957acd6ca49f0b945ea19f694489ad408d5e7 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 12 Oct 2017 00:32:44 -0400 Subject: [PATCH 11/14] Add the SNAP_REEXEC=0 enviroment to the subiquity service as well. --- debian/changelog | 6 ++++++ .../overlay/lib/systemd/system/subiquity.service | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 77c7f5af..04d6b6d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.475) UNRELEASED; urgency=medium + + * Add the SNAP_REEXEC=0 enviroment to the subiquity service as well. + + -- Steve Langasek Thu, 12 Oct 2017 00:32:23 -0400 + livecd-rootfs (2.474) artful; urgency=medium * Fix wrong variable name in systemd unit snippets. 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 be4e1c54..36df8e1a 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 @@ -9,6 +9,7 @@ ConditionPathExists=!/run/subiquity/complete [Service] Environment=PYTHONPATH=/usr/share/subiquity +Environment=SNAP_REEXEC=0 ExecStartPre=/bin/systemctl stop getty@tty1 ExecStartPre=/bin/dmesg -n 1 ExecStartPre=/snap/bin/subiquity.subiquity-loadkeys From c388598f88304b2b934525b8f090878125f4d5ac Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 12 Oct 2017 00:32:52 -0400 Subject: [PATCH 12/14] releasing package livecd-rootfs version 2.475 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 04d6b6d7..1aad84ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (2.475) UNRELEASED; urgency=medium +livecd-rootfs (2.475) artful; urgency=medium * Add the SNAP_REEXEC=0 enviroment to the subiquity service as well. - -- Steve Langasek Thu, 12 Oct 2017 00:32:23 -0400 + -- Steve Langasek Thu, 12 Oct 2017 00:32:46 -0400 livecd-rootfs (2.474) artful; urgency=medium From bea8a0696e47cf4d3be9d047fa45279029faab6a Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 12 Oct 2017 09:23:44 -0400 Subject: [PATCH 13/14] snap.subiquity.started.service must be RemainAfterExit=yes to satisfy the service dependencies. --- debian/changelog | 7 +++++++ .../system/snap.subiquity.started.service.d/no-reexec.conf | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1aad84ed..cf6c5710 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.476) UNRELEASED; urgency=medium + + * snap.subiquity.started.service must be RemainAfterExit=yes to satisfy + the service dependencies. + + -- Steve Langasek Thu, 12 Oct 2017 09:23:16 -0400 + livecd-rootfs (2.475) artful; urgency=medium * Add the SNAP_REEXEC=0 enviroment to the subiquity service as well. 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 14a6b477..52bf88df 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,3 @@ [Service] +RemainAfterExit=yes Environment=SNAP_REEXEC=0 From ca8e7a90d5b45b444ea639fe3fc2d57b83c22dcc Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 12 Oct 2017 09:23:54 -0400 Subject: [PATCH 14/14] releasing package livecd-rootfs version 2.476 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cf6c5710..eedeb482 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -livecd-rootfs (2.476) UNRELEASED; urgency=medium +livecd-rootfs (2.476) artful; urgency=medium * snap.subiquity.started.service must be RemainAfterExit=yes to satisfy the service dependencies. - -- Steve Langasek Thu, 12 Oct 2017 09:23:16 -0400 + -- Steve Langasek Thu, 12 Oct 2017 09:23:52 -0400 livecd-rootfs (2.475) artful; urgency=medium