From 7c4ad855094fdda5dccd70a2ea039b54e5791824 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 6 Sep 2023 12:59:40 -0700 Subject: [PATCH] Merge some more live image definitions --- live-build/auto/config | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index 63e28f20..b1f25bb6 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -799,9 +799,9 @@ case $PROJECT in LIVE_TASK='edubuntu-live' ;; - ubuntucinnamon) - add_task install minimal standard ubuntucinnamon-desktop - LIVE_TASK=ubuntucinnamon-live + lubuntu|ubuntu-gnome|ubuntu-unity|ubuntucinnamon) + add_task install minimal standard ${PROJECT}-desktop + LIVE_TASK=${PROJECT}-live ;; xubuntu) @@ -816,16 +816,6 @@ case $PROJECT in LIVE_TASK='xubuntu-live' ;; - lubuntu) - add_task install minimal standard lubuntu-desktop - LIVE_TASK='lubuntu-live' - ;; - - ubuntu-gnome|ubuntu-unity) - add_task install minimal standard ${PROJECT}-desktop - LIVE_TASK=${PROJECT}-live - ;; - ubuntu-budgie) case ${SUBPROJECT:-} in legacy)