From 10e718a019977dd7098599d36e0a1b53c93211e4 Mon Sep 17 00:00:00 2001
From: Erich Eickmeyer <erich@ericheickmeyer.com>
Date: Mon, 18 Mar 2024 12:48:39 -0700
Subject: [PATCH] Switch Ubuntu MATE to layered image

Ubuntu MATE is switching to a layered image in preparation to
use ubuntu-desktop-provision. Luckily, their seed structure is
already well-structured for layering, so this is easily done.
---
 live-build/auto/config | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/live-build/auto/config b/live-build/auto/config
index 83554389..d8f5242e 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -570,7 +570,7 @@ case $IMAGEFORMAT in
 		case $PROJECT in
 			ubuntu-server|ubuntu-wsl|ubuntu-oem|ubuntu|\
 			ubuntu-budgie|ubuntustudio-dvd|edubuntu|ubuntucinnamon|xubuntu|\
-		        ubuntukylin)
+		        ubuntukylin|ubuntu-mate)
 				;;
 			*)
 				add_package live casper
@@ -993,8 +993,35 @@ case $PROJECT in
 		;;
 
 	ubuntu-mate)
-		add_task install minimal standard ubuntu-mate-core ubuntu-mate-desktop
-		LIVE_TASK='ubuntu-mate-live'
+		# Ubuntu MATE now ships the new installer.
+		touch config/universe-enabled
+		PASSES_TO_LAYERS="true"
+		KERNEL_FLAVOURS=generic
+		add_task minimal minimal standard ubuntu-mate-core
+		add_task minimal.standard ubuntu-mate-desktop
+		add_task minimal.standard.live ubuntu-mate-live
+		add_package minimal.standard.live linux-$KERNEL_FLAVOURS
+		cat <<-EOF > config/minimal.catalog-in.yaml
+			name: "Ubuntu MATE Desktop (minimized)"
+			description: >-
+			  A minimal installation of the Ubuntu MATE Desktop.
+			id: ubuntu-mate-desktop-minimal
+			type: fsimage-layered
+			variant: desktop
+			locale_support: langpack
+		EOF
+		cat <<-EOF > config/minimal.standard.catalog-in.yaml
+			name: "Ubuntu MATE Desktop"
+			description: >-
+			  A full featured Ubuntu MATE Desktop.
+			id: ubuntu-mate-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
 		;;
 
 	ubuntustudio-dvd)