Merge ~medicalwei/debian-cd/+git/ubuntu:oem-mantic into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

[Yao Wei]

add ubuntu-oem project for kernel params and initrd

[Yao Wei (medicalwei)]

I am going to disapprove this proposal myself since mantic does not have OEM kernel. We should push this diff on 24.04.

review: Disapprove

[Steve Langasek (vorlon)]

I think it's fine for us to land such changes in an interim release rather than waiting for the 24.04 cycle to open. In principle this is useful for CI against trunk. (Even if there are no plans for this to happen right now.)

[Steve Langasek (vorlon)]

review: Needs Fixing

[Yao Wei (medicalwei)]

review: Abstain

[Yao Wei (medicalwei)]

I updated it so it takes DEBVERSION and see whether there's LTS in the end of the version name to assume that oem kernel is used. Also, making ubuntu and ubuntu-oem use the same kernel command parameters.

[Steve Langasek (vorlon)]

This unfortunately should be retargeted to the noble directory now, as tools/boot/mantic is no longer used for any image builds.

review: Needs Fixing

Unmerged commits

e156deb... by Yao Wei on 2023-07-14

add ubuntu-oem project for kernel params and initrd

diff --git a/tools/boot/mantic/boot-amd64 b/tools/boot/mantic/boot-amd64
index 416215f..5cb766e 100755
--- a/tools/boot/mantic/boot-amd64
+++ b/tools/boot/mantic/boot-amd64
@@ -20,6 +20,9 @@ cd $CDDIR/..
 FLAVOUR=generic
 if [ "$PROJECT" = "ubuntustudio" ]; then
     FLAVOUR=lowlatency
+elif [ "$PROJECT" = "ubuntu-oem" ] && [[ "$DEBVERSION" =~ LTS$ ]]; then
+    # If it is an LTS version, assume that we have an OEM kernel for it.
+    FLAVOUR=oem
 fi
 
 # rename kernel+initrd
diff --git a/tools/boot/mantic/common.sh b/tools/boot/mantic/common.sh
index ee59069..5db9fd0 100644
--- a/tools/boot/mantic/common.sh
+++ b/tools/boot/mantic/common.sh
@@ -1,7 +1,7 @@
 # encode the right CD kernel parameteres, for every project
 default_kernel_params() {
     case $PROJECT in
-        ubuntu)
+        ubuntu|ubuntu-oem)
             if [ "$SUBPROJECT" = "legacy" ]; then
                 KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu.seed maybe-ubiquity quiet splash --- "
             elif [ "$SUBPROJECT" = "canary" ]; then
@@ -13,6 +13,9 @@ default_kernel_params() {
                 # an overlay and boot from.
                 KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }layerfs-path=minimal.standard.live.squashfs --- quiet splash"
             fi
+            if [ "$PROJECT" = "ubuntu-oem" ]; then
+                KERNEL_PARAMS+=" nopersistent"
+            fi
             ;;
         ubuntukylin)
             KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu.seed locale=zh_CN keyboard-configuration/layoutcode?=cn maybe-ubiquity quiet splash --- "