Merge remote-tracking branch 'mwhudson/use-server-live-task' into ubuntu/master

debian/changelog

@@ -3,6 +3,10 @@ livecd-rootfs (23.10.34) UNRELEASED; urgency=medium
   * Drop (outdated, inconsistent) /etc/hosts from ubuntu-server chroot
     includes.
 
+  [ Michael Hudson-Doyle ]
+  * auto/config: use the new server-live task to reduce the use of explicit
+    calls to add_package and add_snap a bit.
+
  -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 06 Sep 2023 18:28:06 -0700
 
 livecd-rootfs (23.10.33) mantic; urgency=medium

live-build/auto/config

@@ -879,11 +879,7 @@ case $PROJECT in
 				add_task ubuntu-server-minimal.ubuntu-server minimal standard server
 				add_package ubuntu-server-minimal.ubuntu-server cloud-init
 
-				add_package ubuntu-server-minimal.ubuntu-server.installer linux-firmware casper openssh-server
+				add_task ubuntu-server-minimal.ubuntu-server.installer server-live
-				add_snap ubuntu-server-minimal.ubuntu-server.installer subiquity/classic
-				if [ $ARCH = s390x ]; then
-					add_package ubuntu-server-minimal.ubuntu-server.installer s390-tools-zkey
-				fi
 
 				# Live server ISOs for LTS point releases past .2 offer both
 				# the GA and HWE kernels (in separate layers) so this code is