add a minimal server layer under the full server layer

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.733) UNRELEASED; urgency=medium
+
+  * Add a minimal server layer underneath the full server layer. Continue to
+    mount the full server layer at /media/filesystem for now to keep
+    compatibility with current subiquity.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Tue, 03 Aug 2021 16:34:57 +1200
+
 livecd-rootfs (2.732) impish; urgency=medium
 
   [ Michael Hudson-Doyle ]

live-build/auto/config

@@ -773,15 +773,17 @@ case $PROJECT in
 		case ${SUBPROJECT:-} in
 			live)
 				PASSES_TO_LAYERS=true
-				add_task ubuntu-server minimal standard server
+				add_task ubuntu-server-minimal server-minimal
+				add_package ubuntu-server-minimal lxd-installer
+				add_task ubuntu-server-minimal.ubuntu-server minimal standard server
 				# add_task really should do this itself but for now...
-				snap_from_seed server config/package-lists/livecd-rootfs.snaplist.chroot_ubuntu-server.full
+				snap_from_seed server config/package-lists/livecd-rootfs.snaplist.chroot_ubuntu-server-minimal.ubuntu-server.full
-				add_package ubuntu-server cloud-init
+				add_package ubuntu-server-minimal.ubuntu-server cloud-init
 
-				add_package ubuntu-server.installer linux-firmware lupin-casper openssh-server
+				add_package ubuntu-server-minimal.ubuntu-server.installer linux-firmware lupin-casper openssh-server
-				add_snap ubuntu-server.installer subiquity/classic
+				add_snap ubuntu-server-minimal.ubuntu-server.installer subiquity/classic
 				if [ $ARCH = s390x ]; then
-					add_package ubuntu-server.installer s390-tools-zkey
+					add_package ubuntu-server-minimal.ubuntu-server.installer s390-tools-zkey
 				fi
 
 				# Live server ISOs for LTS point releases past .2 offer both
@@ -804,8 +806,8 @@ case $PROJECT in
 						exit 1
 					fi
 
-					add_package ubuntu-server.installer.$flavor $kernel_metapkg
+					add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor $kernel_metapkg
-					LIVE_PASSES="${LIVE_PASSES:+$LIVE_PASSES }ubuntu-server.installer.$flavor"
+					LIVE_PASSES="${LIVE_PASSES:+$LIVE_PASSES }ubuntu-server-minimal.ubuntu-server.installer.$flavor"
 				done
 				;;
 			*)

live-build/ubuntu-server/hooks/02-installer-bits.chroot

@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 # vi: ts=4 noexpandtab
 
-if [ "${PASS}" != "ubuntu-server.installer" ]; then
+if [ "${PASS}" != "ubuntu-server-minimal.ubuntu-server.installer" ]; then
     exit 0
 fi
 

live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early

@@ -2,7 +2,7 @@
 # vi: ts=4 noexpandtab
 
 case $PASS in
-    ubuntu-server.installer.*)
+    ubuntu-server-minimal.ubuntu-server.installer.*)
         flavor=${PASS##*.}
         if [ "$flavor" = "generic" ]; then
             kernel_metapkg=linux-generic

live-build/ubuntu-server/hooks/04-kernel-bits.binary

@@ -2,7 +2,7 @@
 # vi: ts=4 noexpandtab
 
 case $PASS in
-    ubuntu-server.installer.*)
+    ubuntu-server-minimal.ubuntu-server.installer.*)
         flavor=${PASS##*.}
         ;;
     *)

live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/media-filesystem.mount

@@ -0,0 +1,5 @@
+[Mount]
+What=/cdrom/casper/ubuntu-server-minimal.ubuntu-server.squashfs
+Where=/media/filesystem
+Type=squashfs
+Options=ro

live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/media-filesystem.mount

@@ -1,5 +0,0 @@
-[Mount]
-What=/cdrom/casper/ubuntu-server.squashfs
-Where=/media/filesystem
-Type=squashfs
-Options=ro