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

[Simon Quigley]

Ensure Lubuntu and Kubuntu both get OEM boot entries

[Utkarsh Gupta (utkarsh)]

OK, I suppose this is tested with other bits. +1.

review: Approve

[Brian Murray (brian-murray)]

How has this been tested?

review: Needs Information

[Simon Quigley (tsimonq2)]

The actual kernel parameters were tested as follows:
 1. Boot a Lubuntu or Kubuntu Noble daily.
 2. Instead of pressing Enter on "Try or Install {L,K}ubuntu", press "e" to edit the boot entry.
 3. Edit the vmlinuz line in the boot entries differently for Kubuntu and Lubuntu:
   a. For Lubuntu, remove "file=/cdrom/preseed/lubuntu.seed" and add "maybe-calamares oem-config/enable=true" in its place.
   b. For Kubuntu, add "maybe-calamares oem-config/enable=true" before "quiet".
 4. Press Ctrl + X and wait for the system to boot up. It should show the installer prompt as normal.
 5. Switch to a TTY, download and install:
   a. lubuntu-installer-prompt 24.04.6 on Lubuntu.
   b. kubuntu-installer-prompt 24.04.10 on Kubuntu.
 6. Run `sudo systemctl restart sddm` and observe the OEM installation prompt.

This code specifically is based on the stanza above it:
+# Calamares-based projects get OEM mode
+case $KERNEL_PARAMS in
+ *maybe-calamares*)
+ cat >> $CDDIR/boot/grub/grub.cfg <<EOF
+menuentry "OEM install (for manufacturers)" {
+ set gfxpayload=keep
+ linux /casper/vmlinuz $KERNEL_PARAMS oem-config/enable=true
+ initrd /casper/initrd
+}
+EOF
+ ;;
+esac

The diff between the stanza above it and the new stanza is as follows:
-# ubiquity based projects get OEM mode
+# Calamares-based projects get OEM mode
 case $KERNEL_PARAMS in
- *maybe-ubiquity*)
+ *maybe-calamares*)
         cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "OEM install (for manufacturers)" {
     set gfxpayload=keep
- linux /casper/vmlinuz ${KERNEL_PARAMS/maybe-ubiquity/only-ubiquity oem-config/enable=true}
+ linux /casper/vmlinuz $KERNEL_PARAMS oem-config/enable=true
     initrd /casper/initrd
 }
 EOF

I find it reasonable to conclude that adding maybe-calamares to the kernel parameters would allow this new stanza to be ran, which would be nearly identical in functionality to the maybe-ubiquity stanza above it, adding this boot entry with the tested kernel parameters.

Please let me know if you have any further questions.

[Łukasz Zemczak (sil2100)]

Looks sane in general and running the shell from boot-amd64 seems to work. I'm a bit surprised why a separate one-case case switch has been added instead of adding this to the maybe-ubiquity one (or replacing it), but that's not critical. This works at least.

[Steve Langasek (vorlon)]

review: Needs Information

[Steve Langasek (vorlon)]

review: Approve

diff --git a/tools/boot/noble/boot-amd64 b/tools/boot/noble/boot-amd64
index 416215f..84a50c8 100755
--- a/tools/boot/noble/boot-amd64
+++ b/tools/boot/noble/boot-amd64
@@ -155,6 +155,19 @@ EOF
         ;;
 esac
 
+# Calamares-based projects get OEM mode
+case $PROJECT in
+    lubuntu|kubuntu)
+        cat >> $CDDIR/boot/grub/grub.cfg <<EOF
+menuentry "OEM install (for manufacturers)" {
+	set gfxpayload=keep
+	linux	/casper/vmlinuz $KERNEL_PARAMS oem-config/enable=true
+	initrd	/casper/initrd
+}
+EOF
+        ;;
+esac
+
 # Currently only server is built with HWE, hence no safe-graphics/OEM
 if [ "$HWE" ]; then
     cat >> $CDDIR/boot/grub/grub.cfg <<EOF
diff --git a/tools/boot/noble/common.sh b/tools/boot/noble/common.sh
index 1fed0d3..c3c18e5 100644
--- a/tools/boot/noble/common.sh
+++ b/tools/boot/noble/common.sh
@@ -1,15 +1,12 @@
 # encode the right CD kernel parameteres, for every project
 default_kernel_params() {
     case $PROJECT in
-        ubuntu|edubuntu|ubuntustudio|ubuntu-budgie|kubuntu|ubuntu-unity|ubuntucinnamon|xubuntu|ubuntu-mate)
+        ubuntu|edubuntu|ubuntustudio|ubuntu-budgie|kubuntu|lubuntu|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 quiet splash --- "
             ;;
-        lubuntu)
-            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/lubuntu.seed quiet splash --- "
-            ;;
         ubuntu-server)
             KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS } ---"
             ;;