respond to some review feedback

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. 
 

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
+				# Stop lp installing casper into filesystem.squashfs
-				# (It's manually installed into installer.sqashfs in
+				#  by skipping lb_chroot_live-packages.
-				# 032-installer-squashfs.binary)
+				skip_lb_stage chroot_live-packages
-				mkdir -p .build
-				touch .build/chroot_live-packages
 				INITRAMFS_TYPE=auto
 				;;
 			*)

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"
+}

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 user-setup lupin-casper
-chroot $SQUASH_ROOT apt-get -y install lupin-casper
 
 # Installing lupin-casper means we need a new initramfs, so we
 # cargo cult stuff from lb_chroot_hacks: