diff --git a/debian/changelog b/debian/changelog index 96f7dc8b..5173909d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ livecd-rootfs (23.10.33) UNRELEASED; urgency=medium * Drop references to mythbuntu, obsolete after xenial. * Parameterize and consolidate live image definitions for flavors using a common pattern + * generic is the default kernel flavor in live-build on Ubuntu; remove + hard-coded cargo-culting of this setting. -- Steve Langasek Wed, 06 Sep 2023 11:23:17 -0700 diff --git a/live-build/auto/config b/live-build/auto/config index b9fb9a34..63e28f20 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -802,7 +802,6 @@ case $PROJECT in ubuntucinnamon) add_task install minimal standard ubuntucinnamon-desktop LIVE_TASK=ubuntucinnamon-live - KERNEL_FLAVOURS=generic ;; xubuntu) @@ -815,17 +814,11 @@ case $PROJECT in ;; esac LIVE_TASK='xubuntu-live' - case $ARCH in - amd64) KERNEL_FLAVOURS=generic ;; - esac ;; lubuntu) add_task install minimal standard lubuntu-desktop LIVE_TASK='lubuntu-live' - case $ARCH in - amd64) KERNEL_FLAVOURS=generic ;; - esac ;; ubuntu-gnome|ubuntu-unity)