From 12846905fd33eb8e31c89bf12617ed3f4f9b618d Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Wed, 23 Nov 2022 17:15:15 +0100
Subject: [PATCH] Change the desktop build to let canary be the default

---
 debian/tests/default-bootstraps |  2 +-
 live-build/auto/build           |  2 +-
 live-build/auto/config          | 77 ++++++++++++++++-----------------
 3 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps
index 46878550..9e1fc5f6 100755
--- a/debian/tests/default-bootstraps
+++ b/debian/tests/default-bootstraps
@@ -20,7 +20,7 @@ ALL_TRIPLETS="
  ubuntu-unity::
  mythbuntu::
  ubuntu::
- ubuntu:canary:
+ ubuntu:legacy:
  ubuntu-base::
  ubuntu-base:buildd:
  ubuntu-budgie::
diff --git a/live-build/auto/build b/live-build/auto/build
index fbffed2c..4a0dd317 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -527,7 +527,7 @@ for OUTPUT in ext2 ext3 ext4 manifest manifest-remove size squashfs; do
 done
 
 # we don't need a manifest-remove for a layered-aware installer
-if [ "$PROJECT" = "ubuntu" ] && [ "$SUBPROJECT" = "canary" ]; then
+if [ "$PROJECT" = "ubuntu" ] && [ "$SUBPROJECT" != "legacy" ]; then
 	rm -f livecd.${PROJECT}-manifest-remove
 	rm -f config/manifest-minimal-remove
 fi
diff --git a/live-build/auto/config b/live-build/auto/config
index 1d4432e7..1722e98b 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -550,7 +550,7 @@ case $IMAGEFORMAT in
 			ubuntu-wsl)
 				;;
 			ubuntu)
-				if [ "$SUBPROJECT" != "canary" ]; then
+				if [ "$SUBPROJECT" = "legacy" ]; then
 					add_package live casper
 				fi
 				;;
@@ -681,7 +681,43 @@ case $PROJECT in
 	ubuntu|ubuntu-dvd)
 
 		case ${SUBPROJECT:-} in
-			canary)
+			legacy)
+				LIVE_TASK='ubuntu-live'
+				add_task install minimal standard ubuntu-desktop
+				add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
+				KERNEL_FLAVOURS='generic-hwe-22.04'
+				if [ "$SUBARCH" = "intel-iot" ]; then
+					KERNEL_FLAVOURS='image-intel'
+				fi
+				;;
+			desktop-preinstalled)
+				add_task install minimal standard ubuntu-desktop
+				case $SUBARCH in
+					raspi)
+						add_task install ubuntu-desktop-raspi
+						# XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project
+						#  for existing raspi preinstalled images
+						# XXX: I would prefer to use --hdd-label=desktop-rootfs like 040-hyperv-desktop-images.binary
+						OPTS="${OPTS:+$OPTS }--initramfs=none"
+						OPTS="${OPTS:+$OPTS }--system=normal"
+						OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
+						OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
+						OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
+						;;
+					intel-iot)
+						KERNEL_FLAVOURS='image-intel'
+						OPTS="${OPTS:+$OPTS }--initramfs=none"
+						OPTS="${OPTS:+$OPTS }--system=normal"
+						OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
+						OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
+						OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
+						;;
+					*)
+						## Otherwise HYPERV image options.... *crickets* see the hyperv hook
+						;;
+				esac
+				;;
+			*)
 				touch config/universe-enabled
 				PASSES_TO_LAYERS="true"
 				KERNEL_FLAVOURS='generic-hwe-22.04'
@@ -718,43 +754,6 @@ case $PROJECT in
 				/usr/share/livecd-rootfs/checkout-translations-branch \
 					https://git.launchpad.net/subiquity po config/catalog-translations
 				;;
-
-			desktop-preinstalled)
-				add_task install minimal standard ubuntu-desktop
-				case $SUBARCH in
-					raspi)
-						add_task install ubuntu-desktop-raspi
-						# XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project
-						#  for existing raspi preinstalled images
-						# XXX: I would prefer to use --hdd-label=desktop-rootfs like 040-hyperv-desktop-images.binary
-						OPTS="${OPTS:+$OPTS }--initramfs=none"
-						OPTS="${OPTS:+$OPTS }--system=normal"
-						OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
-						OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
-						OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
-						;;
-					intel-iot)
-						KERNEL_FLAVOURS='image-intel'
-						OPTS="${OPTS:+$OPTS }--initramfs=none"
-						OPTS="${OPTS:+$OPTS }--system=normal"
-						OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
-						OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
-						OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
-						;;
-					*)
-						## Otherwise HYPERV image options.... *crickets* see the hyperv hook
-						;;
-				esac
-				;;
-			*)
-				LIVE_TASK='ubuntu-live'
-				add_task install minimal standard ubuntu-desktop
-				add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
-				KERNEL_FLAVOURS='generic-hwe-22.04'
-				if [ "$SUBARCH" = "intel-iot" ]; then
-					KERNEL_FLAVOURS='image-intel'
-				fi
-				;;
 		esac
 		;;