From 2b5e8a81e57ae89b9ebed9bab20423d2e61d80d0 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 22 Sep 2022 15:36:47 -0700 Subject: [PATCH] Default to using 'desktop' for the base seed so we don't have another place we have to extend the list for each new flavor (ubuntu-unity) --- debian/changelog | 7 +++++++ live-build/auto/config | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2f9da9b1..888cdb93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.782) UNRELEASED; urgency=medium + + * Default to using 'desktop' for the base seed so we don't have another + place we have to extend the list for each new flavor (ubuntu-unity) + + -- Steve Langasek Thu, 22 Sep 2022 15:36:25 -0700 + livecd-rootfs (2.781) kinetic; urgency=medium * Drop override of components for raspi images. The reference to diff --git a/live-build/auto/config b/live-build/auto/config index b895a4df..2d411758 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1025,9 +1025,6 @@ 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:*|kubuntu*:*|lubuntu*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*) - BASE_SEED='desktop' - ;; ubuntu-wsl:*) BASE_SEED='wsl' ;; @@ -1037,6 +1034,9 @@ case $PROJECT:${SUBPROJECT:-} in ubuntu-server:live) BASE_SEED='server' ;; + *) + BASE_SEED='desktop' + ;; esac if [ "$PASSES_TO_LAYERS" != "true" ] && [ -n "${BASE_SEED}" ]; then