From 0113b9aad780af30df2f667a886b5e4e2a2db96e Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 13 Dec 2017 16:13:14 +1300 Subject: [PATCH] self-review --- debian/changelog | 2 +- live-build/auto/config | 2 ++ live-build/ubuntu-server/hooks/032-installer-squashfs.binary | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8cca7e75..6b66e3d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.488~ppa4) bionic; urgency=medium +livecd-rootfs (2.488~ppa5) bionic; urgency=medium * Move casper from filesystem.squashfs to installer.squashfs. diff --git a/live-build/auto/config b/live-build/auto/config index 48be4ca0..2b542ace 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -144,6 +144,8 @@ case $IMAGEFORMAT in case $PROJECT:${SUBPROJECT:-} in ubuntu-server:live) # Hack to stop lb installing casper into filesystem.squashfs + # (It's manually installed into installer.sqashfs in + # 032-installer-squashfs.binary) 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 f87fe5e8..e5e94ed4 100755 --- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary +++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary @@ -54,7 +54,6 @@ mv $SQUASH_ROOT/boot/initrd.img-* binary/casper/ chroot $SQUASH_ROOT apt-get -y install curtin - # Don't let cloud-init run in the live session. touch $SQUASH_ROOT/etc/cloud/cloud-init.disabled