Merge ~tsimonq2/debian-cd/+git/ubuntu:no-oem-entries into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

[Simon Quigley]

Related to bug 2048473 and bug 2063291.

In the live ISOs for Ubuntu MATE, Ubuntu Cinnamon, Ubuntu Kylin, and Xubuntu, there is a boot entry for an OEM mode. Unfortunately, that OEM mode does not exist yet for the main Ubuntu Desktop Installer. Remove the appropriate entries for those four flavors, to be re-added once that functionality exists again.

[Łukasz Zemczak (sil2100)]

review: Approve

[Martin Wimpress  (flexiondotorg)]

review: Approve

[handsome_feng (feng-kylin)]

Can we respin the Ubuntu Kylin ISO after this fix released?

Thanks!

[Sean Davis (bluesabre)]

Ack for Xubuntu

review: Approve

[Joshua Peisach (itzswirlz)]

Good for ubuntu cinnamon

review: Approve

diff --git a/tools/boot/noble/common.sh b/tools/boot/noble/common.sh
index c1f6d7a..1fed0d3 100644
--- a/tools/boot/noble/common.sh
+++ b/tools/boot/noble/common.sh
@@ -1,24 +1,15 @@
 # encode the right CD kernel parameteres, for every project
 default_kernel_params() {
     case $PROJECT in
-        ubuntu|edubuntu|ubuntustudio|ubuntu-budgie|kubuntu|ubuntu-unity)
+        ubuntu|edubuntu|ubuntustudio|ubuntu-budgie|kubuntu|ubuntu-unity|ubuntucinnamon|xubuntu|ubuntu-mate)
             KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS } --- quiet splash"
             ;;
         ubuntukylin)
-            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu.seed locale=zh_CN keyboard-configuration/layoutcode?=cn maybe-ubiquity quiet splash --- "
-            ;;
-        ubuntucinnamon)
-            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntucinnamon.seed maybe-ubiquity quiet splash --- "
+            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu.seed locale=zh_CN keyboard-configuration/layoutcode?=cn quiet splash --- "
             ;;
         lubuntu)
             KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/lubuntu.seed quiet splash --- "
             ;;
-        xubuntu)
-            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/xubuntu.seed maybe-ubiquity quiet splash --- "
-            ;;
-        ubuntu-mate)
-            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu-mate.seed maybe-ubiquity quiet splash --- "
-            ;;
         ubuntu-server)
             KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS } ---"
             ;;