From 2e1b092a0e8c5d21c8f95c16cf4b42e0971572a0 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 7 Sep 2023 12:55:53 +1200 Subject: [PATCH] auto/config: use the new server-live task to reduce the use of explicit calls to add_package and add_snap a bit. --- debian/changelog | 7 +++++++ live-build/auto/config | 6 +----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 63a4ad22..d34f4b55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (23.10.32) UNRELEASED; urgency=medium + + * auto/config: use the new server-live task to reduce the use of explicit + calls to add_package and add_snap a bit. + + -- Michael Hudson-Doyle Thu, 07 Sep 2023 12:55:07 +1200 + livecd-rootfs (23.10.31) mantic; urgency=medium * blkid is unreliable in mount_image(), but this blkid call is only here diff --git a/live-build/auto/config b/live-build/auto/config index 13eb7b45..f06fd683 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -978,11 +978,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_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 + add_task ubuntu-server-minimal.ubuntu-server.installer server-live # Live server ISOs for LTS point releases past .2 offer both # the GA and HWE kernels (in separate layers) so this code is