diff --git a/debian/changelog b/debian/changelog index 94d590b4..46d4cf79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (24.04.39) UNRELEASED; urgency=medium + + * Pare down 'BASE_SEED' handling to only those flavors which still use it. + + -- Steve Langasek Sun, 18 Feb 2024 10:27:50 -0800 + livecd-rootfs (24.04.38) noble; urgency=medium * Fix overlooked syntax error diff --git a/live-build/auto/config b/live-build/auto/config index 7bb4bd9e..bd7af847 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1209,29 +1209,10 @@ case $SUBPROJECT in ;; esac -# we'll expand the base seed given here according to the STRUCTURE file, and -# then look in all of the seeds found to see which snaps are seeded -case $PROJECT:${SUBPROJECT:-} in - ubuntu-wsl:*) - BASE_SEED='wsl' - ;; - ubuntu-cpc:*) - # we don't preseed any snaps in minimized images, so no need to set - # BASE_SEED in that case. - if [ "${SUBPROJECT:-}" != minimized ]; then - BASE_SEED='server' - fi - ;; - ubuntu-server:live) - BASE_SEED='server' - ;; - ubuntu-base:*|ubuntu-core:*|ubuntu-mini-iso:|ubuntu-oci:*|\ - xubuntu:minimal) - ;; - edubuntu:*) - BASE_SEED='desktop-gnome' - ;; - *) +case $PROJECT in + kubuntu|ubuntu-mate|ubuntu-unity|ubuntukylin) + # only used now for the 'minimal-remove' functionality, + # which is not used at all in layered images BASE_SEED='desktop' ;; esac