From ba38059b0b968b19e701db29207b67a276708389 Mon Sep 17 00:00:00 2001
From: Sean Davis <sean@bluesabre.org>
Date: Sat, 17 Feb 2024 06:35:13 -0500
Subject: [PATCH] Copy ubuntu-cinnamon setup

---
 live-build/auto/config                        | 56 +++++++++++++++++--
 .../hooks/020-ubuntu-live.chroot_early        |  1 +
 2 files changed, 52 insertions(+), 5 deletions(-)
 create mode 120000 live-build/xubuntu/hooks/020-ubuntu-live.chroot_early

diff --git a/live-build/auto/config b/live-build/auto/config
index 1f8e950e..db70ef4d 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -569,7 +569,7 @@ case $IMAGEFORMAT in
 	*)
 		case $PROJECT in
 			ubuntu-server|ubuntu-wsl|ubuntu-oem|ubuntu|\
-			ubuntu-budgie|ubuntustudio-dvd|edubuntu|ubuntucinnamon)
+			ubuntu-budgie|ubuntustudio-dvd|edubuntu|ubuntucinnamon|xubuntu)
 				;;
 			*)
 				add_package live casper
@@ -882,13 +882,59 @@ case $PROJECT in
 	xubuntu)
 		case ${SUBPROJECT:-} in
 			minimal)
-				add_task install minimal standard xubuntu-minimal
+				# Xubuntu now ships the new installer.
+				touch config/universe-enabled
+				PASSES_TO_LAYERS="true"
+				KERNEL_FLAVOURS=generic
+				add_task minimal minimal standard xubuntu-minimal
+				add_task minimal.standard xubuntu-minimal
+				add_task minimal.standard.live xubuntu-live
+				add_package minimal.standard.live linux-$KERNEL_FLAVOURS
+				cat <<-EOF > config/minimal.standard.catalog-in.yaml
+					name: "Xubuntu Desktop"
+					description: >-
+					A full featured Xubuntu Desktop.
+					id: xubuntu-minimal
+					type: fsimage-layered
+					variant: desktop
+					locale_support: langpack
+					default: yes
+				EOF
+				/usr/share/livecd-rootfs/checkout-translations-branch \
+					https://git.launchpad.net/subiquity po config/catalog-translations
 				;;
 			*)
-				add_task install minimal standard xubuntu-desktop
+				# Xubuntu now ships the new installer.
+				touch config/universe-enabled
+				PASSES_TO_LAYERS="true"
+				KERNEL_FLAVOURS=generic
+				add_task minimal minimal standard xubuntu-desktop
+				add_task minimal.standard xubuntu-desktop
+				add_task minimal.standard.live xubuntu-live
+				add_package minimal.standard.live linux-$KERNEL_FLAVOURS
+				cat <<-EOF > config/minimal.catalog-in.yaml
+					name: "Xubuntu Desktop (minimized)"
+					description: >-
+					A minimal installation of the Xubuntu Desktop.
+					id: xubuntu-desktop-minimal
+					type: fsimage-layered
+					variant: desktop
+					locale_support: langpack
+				EOF
+				cat <<-EOF > config/minimal.standard.catalog-in.yaml
+					name: "Xubuntu Desktop"
+					description: >-
+					A full featured Xubuntu Desktop.
+					id: xubuntu-desktop
+					type: fsimage-layered
+					variant: desktop
+					locale_support: langpack
+					default: yes
+				EOF
+				/usr/share/livecd-rootfs/checkout-translations-branch \
+					https://git.launchpad.net/subiquity po config/catalog-translations
 				;;
 		esac
-		LIVE_TASK='xubuntu-live'
 		;;
 
 	ubuntu-budgie)
@@ -1463,7 +1509,7 @@ esac
 case $PROJECT:${SUBPROJECT:-} in
 	ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \
 		ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:|ubuntu-oem:*| \
-		ubuntustudio-dvd:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*)
+		ubuntustudio-dvd:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*|xubuntu:*)
 		# Ensure that most things e.g. includes.chroot are copied as is
 		for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
 			case $entry in
diff --git a/live-build/xubuntu/hooks/020-ubuntu-live.chroot_early b/live-build/xubuntu/hooks/020-ubuntu-live.chroot_early
new file mode 120000
index 00000000..b410ddab
--- /dev/null
+++ b/live-build/xubuntu/hooks/020-ubuntu-live.chroot_early
@@ -0,0 +1 @@
+../../ubuntu/hooks/020-ubuntu-live.chroot_early
\ No newline at end of file