diff --git a/debian/changelog b/debian/changelog index 26cf864e..6314a75e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.488~ppa1) bionic; urgency=medium + + * Move casper from filesystem.squashfs to installer.squashfs. + + -- Michael Hudson-Doyle Tue, 12 Dec 2017 10:55:10 +1300 + livecd-rootfs (2.487) bionic; urgency=medium * Drop android-tools-fsutils dependency, and instead install it on diff --git a/live-build/auto/config b/live-build/auto/config index 4f3304b2..48be4ca0 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -143,7 +143,9 @@ case $IMAGEFORMAT in INITRAMFS_TYPE=none case $PROJECT:${SUBPROJECT:-} in ubuntu-server:live) - add_package live lupin-casper + # Hack to stop lb installing casper into filesystem.squashfs + mkdir -p .build + touch .build/chroot_live-packages INITRAMFS_TYPE=auto ;; *) diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary index 87c743dd..83df629e 100755 --- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary +++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary @@ -39,6 +39,7 @@ setup_mountpoint binary/boot/squashfs.dir # to see on the installed system chroot $SQUASH_ROOT apt-get update chroot $SQUASH_ROOT apt-get -y install user-setup +chroot $SQUASH_ROOT apt-get -y install lupin-casper chroot $SQUASH_ROOT apt-get -y install curtin # Don't let cloud-init run in the live session.