diff --git a/debian/changelog b/debian/changelog index 57bcd08d..1881d36d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,48 @@ -livecd-rootfs (2.472) UNRELEASED; urgency=medium +livecd-rootfs (2.477) UNRELEASED; urgency=medium - [ Michael Hudson-Doyle ] - * Add snap.subiquity.started.service to subiquity.service's Requires=. + * Purge initramfs-tools from minimized images. + + -- Steve Langasek Fri, 13 Oct 2017 17:14:58 -0400 + +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:52 -0400 + +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:46 -0400 + +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 ] + * 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 ] - * Purge initramfs-tools from minimized images. + * export SNAP_REEXEC=0 to our snappy systemd units in the livefs overlay, + to work around apparmor not working reliably against aufs. + + -- Steve Langasek Wed, 11 Oct 2017 12:46:14 -0400 + +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 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 diff --git a/live-build/auto/config b/live-build/auto/config index 23880265..bf7435d7 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 @@ -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" 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 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..52bf88df --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/system/snap.subiquity.started.service.d/no-reexec.conf @@ -0,0 +1,3 @@ +[Service] +RemainAfterExit=yes +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 new file mode 100644 index 00000000..14a6b477 --- /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=SNAP_REEXEC=0 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