From e35dde7f68bda55438b83f1235c6c12631ff2d5b Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 18 Dec 2018 15:18:00 +1300 Subject: [PATCH] Do not include curtin in the live-server installer.squashfs as the version of subiquity that includes it in the snap has now been released to stable. --- debian/changelog | 3 +++ .../ubuntu-server/hooks/032-installer-squashfs.binary | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 360155ed..92504d69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ livecd-rootfs (2.525.13) UNRELEASED; urgency=medium dependencies. - Do not install user-setup. - Use the core snap from the base filesystem if present. + * Do not include curtin in the live-server installer.squashfs as the + version of subiquity that includes it in the snap has now been released to + stable. -- Michael Hudson-Doyle Thu, 13 Dec 2018 15:22:15 +1300 diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary index d08b4cd9..518fc724 100755 --- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary +++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary @@ -49,12 +49,10 @@ EOF # Prepare installer layer. -# Install any requirements for the installer, for things we don't want -# to see on the installed system -chroot $INSTALLER_ROOT apt-get -y install curtin lupin-casper +# Install casper for live session magic. +chroot $INSTALLER_ROOT apt-get -y install lupin-casper chroot $INSTALLER_ROOT apt-get clean - # For bug #1743643 "Install to dirty disk with swap fails" remove the # "helpful" casper script that mounts any swap partitions it finds. rm -f $INSTALLER_ROOT/usr/share/initramfs-tools/scripts/casper-bottom/*swap