From e950cb2aa8f8ee3693f7e8d01810b6c5bb740b4e Mon Sep 17 00:00:00 2001 From: Erich Eickmeyer Date: Thu, 15 Feb 2024 09:08:39 -0800 Subject: [PATCH 1/3] Change Ubuntu Cinnamon to layered image Ubuntu Cinnamon now uses the new installer and therefore needs to be a layered image to accommodate the minimal install option. --- live-build/auto/config | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index 0646902e..5324337f 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) + ubuntu-budgie|ubuntustudio-dvd|edubuntu|ubuntucinnamon) ;; *) add_package live casper @@ -841,8 +841,40 @@ case $PROJECT in /usr/share/livecd-rootfs/checkout-translations-branch \ https://git.launchpad.net/subiquity po config/catalog-translations ;; + + ubuntucinnamon) + # Ubuntu Cinnamon now ships the new installer. + touch config/universe-enabled + PASSES_TO_LAYERS="true" + KERNEL_FLAVOURS=generic + add_task minimal minimal standard ubuntucinnamon-desktop-minimal + add_task minimal.standard ubuntucinnamon-desktop + add_task minimal.standard.live ubuntucinnamon-live + add_package minimal.standard.live linux-$KERNEL_FLAVOURS + cat <<-EOF > config/minimal.catalog-in.yaml + name: "Ubuntu Cinnamon Desktop (minimized)" + description: >- + A minimal installation of the Ubuntu Cinnamon Desktop. + id: ubuntucinnamon-desktop-minimal + type: fsimage-layered + variant: desktop + locale_support: langpack + EOF + cat <<-EOF > config/minimal.standard.catalog-in.yaml + name: "Ubuntu Cinnamon Desktop" + description: >- + A full featured Ubuntu Cinnamon Desktop. + id: ubuntucinnamon-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 + ;; - lubuntu|ubuntu-gnome|ubuntu-unity|ubuntucinnamon|ubuntukylin) + lubuntu|ubuntu-gnome|ubuntu-unity|ubuntukylin) add_task install minimal standard ${PROJECT}-desktop LIVE_TASK=${PROJECT}-live ;; From 3ec5c06b4fb383a35a94db9525c06ab33d1fbccd Mon Sep 17 00:00:00 2001 From: Erich Eickmeyer Date: Thu, 15 Feb 2024 09:13:15 -0800 Subject: [PATCH 2/3] Copy configs --- live-build/auto/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 5324337f..9d72463b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1463,7 +1463,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:*) + ubuntustudio-dvd:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*) # 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 From 3fc80105d5d1630404b20a6c1526fc9be011f076 Mon Sep 17 00:00:00 2001 From: Erich Eickmeyer Date: Thu, 15 Feb 2024 12:39:15 -0800 Subject: [PATCH 3/3] Add symlink for 020-ubuntu-live.chroot_early --- live-build/ubuntucinnamon/hooks/020-ubuntu-live.chroot_early | 1 + 1 file changed, 1 insertion(+) create mode 120000 live-build/ubuntucinnamon/hooks/020-ubuntu-live.chroot_early diff --git a/live-build/ubuntucinnamon/hooks/020-ubuntu-live.chroot_early b/live-build/ubuntucinnamon/hooks/020-ubuntu-live.chroot_early new file mode 120000 index 00000000..b410ddab --- /dev/null +++ b/live-build/ubuntucinnamon/hooks/020-ubuntu-live.chroot_early @@ -0,0 +1 @@ +../../ubuntu/hooks/020-ubuntu-live.chroot_early \ No newline at end of file