From c85cae9bfe419f2ff0dbded92bbebda356ba6557 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 23 Feb 2018 09:18:33 +1300 Subject: [PATCH] respond to some review feedback --- debian/changelog | 2 +- live-build/auto/config | 8 +++----- live-build/functions | 6 ++++++ .../ubuntu-server/hooks/032-installer-squashfs.binary | 3 +-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 14f736b1..8e1030e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.505) UNRELEASED; urgency=medium +livecd-rootfs (2.505~ppa1) bionic; urgency=medium * Move casper from filesystem.squashfs to installer.squashfs. diff --git a/live-build/auto/config b/live-build/auto/config index 1c762def..d97b0517 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -141,11 +141,9 @@ case $IMAGEFORMAT in INITRAMFS_TYPE=none 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 + # Stop lp installing casper into filesystem.squashfs + # by skipping lb_chroot_live-packages. + skip_lb_stage chroot_live-packages INITRAMFS_TYPE=auto ;; *) diff --git a/live-build/functions b/live-build/functions index 04397fdb..e5eeedaf 100644 --- a/live-build/functions +++ b/live-build/functions @@ -329,3 +329,9 @@ undivert_grub() { chroot "$CHROOT_ROOT" dpkg-divert --remove --local \ --rename /usr/bin/systemd-detect-virt } + +skip_lb_stage() { + STAGE="$1" + mkdir -p .build + touch ".build/$STAGE" +} diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary index ce1a6cb1..47110bb3 100755 --- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary +++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary @@ -50,8 +50,7 @@ EOF # Install any requirements for the installer, for things we don't want # 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 user-setup lupin-casper # Installing lupin-casper means we need a new initramfs, so we # cargo cult stuff from lb_chroot_hacks: