Merge lp:~juliank/debian-cd/boot-oem-kernel into lp:~ubuntu-cdimage/debian-cd/ubun3

[Julian Andres Klode]

[Julian Andres Klode (juliank)]

This is missing the --linux argument to smbios, as I first need to upload grub with that in, but otherwise works fine.

[lp:~juliank/debian-cd/boot-oem-kernel]

2044. By Julian Andres Klode on 2020-03-11

focal amd64 boot: Automatically load OEM kernels (initial version)

Add support for automatically loading oem kernels to the ISO. This initial
version is not entirely correct: We should be passing --linux to smbios, but
first need to upload a grub with that patch in.

The kernels are installed so that generic kernel remains at /casper/vmlinuz,
while oem kernel (or other flavours) are installed to /casper-$flavour.

2045. By Julian Andres Klode on 2020-03-11

simplify the grub.cfg by using casper_flavour instead of casper_{kernel,initrd}

One variable is one variable less than two variables. We save two lines
and redundant stuff.

[Steve Langasek (vorlon)]

review: Needs Fixing

[lp:~juliank/debian-cd/boot-oem-kernel]

2046. By Julian Andres Klode on 2020-03-18

dmi_modalias.cfg: Add --linux argument to smbios executions

It has landed

2047. By Julian Andres Klode on 2020-03-18

Address review comments

[Julian Andres Klode (juliank)]

This may have gone hidden, but I prefer to ship dmi_modalias.cfg now rather than building an extra grub update just to ship that file, because I don't have autopkgtests for it yet, and that all takes extra time, and we gotta get moving.

[lp:~juliank/debian-cd/boot-oem-kernel]

2048. By Julian Andres Klode on 2020-03-24

Do not use oem kernel for Ubuntu-OEM-Kernel-Flavour default systems

If the meta package declares Ubuntu-OEM-Kernel-Flavour: default, do
not use the oem kernel, but the default one (generic, later hwe).

[Iain Lane (laney)]

> This may have gone hidden, but I prefer to ship dmi_modalias.cfg now rather than building an extra grub update just to ship that file

We discussed this. Julian is going to take a task (card?) to do that with the next grub update.

I'm reviewing now.

[Iain Lane (laney)]

Thanks. Please do take that task to fix the FIXME.

review: Approve

=== modified file 'tools/boot/focal/boot-amd64'
--- tools/boot/focal/boot-amd64	2020-03-13 14:09:59 +0000
+++ tools/boot/focal/boot-amd64	2020-03-24 15:59:51 +0000
@@ -151,10 +151,15 @@
     done
     fi
     if [ "$CDIMAGE_LIVE" = 1 ]; then
-	mv $CDDIR/casper/filesystem.kernel-$FLAVOUR $CDDIR/casper/vmlinuz
 	CASPER_KERNEL=/casper/vmlinuz
-	CASPER_INITRD="/casper/initrd$(initrd_suffix "$CDDIR/casper/filesystem.initrd-$FLAVOUR")"
-	mv $CDDIR/casper/filesystem.initrd-$FLAVOUR "$CDDIR$CASPER_INITRD"
+	CASPER_INITRD=/casper/initrd
+	for kernel in $CDDIR/casper/filesystem.kernel-*; do
+	    flavour=${kernel##*filesystem.kernel-}
+	    flavour2="-${flavour}"
+	    [ "$flavour" = "generic" ] && flavour2=""
+	    mv $CDDIR/casper/filesystem.kernel-$flavour $CDDIR$CASPER_KERNEL${flavour2}
+	    mv $CDDIR/casper/filesystem.initrd-$flavour $CDDIR$CASPER_INITRD${flavour2}
+	done
     fi
     echo -n "-cache-inodes -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table " >> $N.mkisofs_opts
     case "$MKISOFS" in
@@ -305,6 +310,24 @@
 rmdir boot$N/isolinux/grub
 sed -i '/^menuentry/Q' $CDDIR/boot/grub/grub.cfg
 
+
+# FIXME: dmi_modalias.cfg should be shipped in grub, with autopkgtest
+cp $BASEDIR/tools/boot/$DI_CODENAME/dmi_modalias.cfg $CDDIR/boot/grub
+
+# This dumps all oem meta packages in the cache, dumps their Modaliases fields,
+# extracts all dmi: modaliases, joins them together using |, and then converts
+# to a regular expressions by: anchoring it using ^(...)$, and converting *
+# to .*.
+# Then it uses grub's regexp module to match that one regex against the
+# dmi_modalias variable that dmi_modalias.cfg generated for us.
+cat >> $CDDIR/boot/grub/grub.cfg <<EOF
+set casper_flavour=""
+source \$prefix/dmi_modalias.cfg
+if regexp '$($BASEDIR/tools/apt-selection cache show ^oem-.*-meta$ | grep-dctrl -v -XF Ubuntu-OEM-Kernel-Flavour default | grep-dctrl -P "" -nsModaliases | grep -o 'dmi:[^), ]*'  | tr '\n' '|'  | sed -E -e 's/(.*)/^(\1)$/' -e 's/\*/.*/g')' "\$dmi_modalias"; then
+    set casper_flavour="-oem"
+fi
+EOF
+
 if [ "$BACKPORT_KERNEL" ]; then
     cat > $CDDIR/boot/grub/hwe-grub.cfg <<EOF
 submenu 'Boot and Install with the HWE kernel' {
@@ -455,16 +478,16 @@
     cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "${livelabel#^}${suffix}" {
 	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT $QUIET $SPLASH$extra_kopt ---
-	initrd	$CASPER_INITRD
+	linux	$CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT $QUIET $SPLASH$extra_kopt ---
+	initrd	$CASPER_INITRD\$casper_flavour
 }
 EOF
 done
     cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
 menuentry "${livelabel#^}" {
 	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
-	initrd	$CASPER_INITRD
+	linux	$CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
+	initrd	$CASPER_INITRD\$casper_flavour
 }
 EOF
     if [ "$NOTRYONLYDO" != "true" ]; then
@@ -480,15 +503,15 @@
 	    cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "Install $HUMANPROJECT${suffix}" {
 	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity $QUIET $SPLASH$extra_kopt ---
-	initrd	$CASPER_INITRD
+	linux	$CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity $QUIET $SPLASH$extra_kopt ---
+	initrd	$CASPER_INITRD\$casper_flavour
 }
 EOF
 	done
 	cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
 menuentry "Install $HUMANPROJECT" {
-	linux	$CASPER_KERNEL $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
-	initrd	$CASPER_INITRD
+	linux	$CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
+	initrd	$CASPER_INITRD\$casper_flavour
 }
 EOF
     fi
@@ -569,8 +592,8 @@
     cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
 menuentry "OEM install (for manufacturers)" {
 	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS ${DEFAULT_PRESEED/$PREFIX_PRESEED/$PREFIX_PRESEED${!kp}}$LAYERFS_PATH_OPT only-ubiquity quiet splash oem-config/enable=true ---
-	initrd	$CASPER_INITRD
+	linux	$CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS ${DEFAULT_PRESEED/$PREFIX_PRESEED/$PREFIX_PRESEED${!kp}}$LAYERFS_PATH_OPT only-ubiquity quiet splash oem-config/enable=true ---
+	initrd	$CASPER_INITRD\$casper_flavour
 }
 EOF
 else
@@ -631,14 +654,14 @@
     cat >> $CDDIR/boot/grub/grub.cfg <<EOF
 menuentry "Check disc for defects" {
 	set gfxpayload=keep
-	linux	$CASPER_KERNEL $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check quiet splash ---
-	initrd	$CASPER_INITRD
+	linux	$CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check quiet splash ---
+	initrd	$CASPER_INITRD\$casper_flavour
 }
 EOF
     cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
 menuentry "Check disc for defects" {
-	linux	$CASPER_KERNEL $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check iso-scan/filename=\${iso_path} quiet splash ---
-	initrd	$CASPER_INITRD
+	linux	$CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check iso-scan/filename=\${iso_path} quiet splash ---
+	initrd	$CASPER_INITRD\$casper_flavour
 }
 EOF
 elif [ "$CDIMAGE_INSTALL_BASE" = 1 ]; then

=== added file 'tools/boot/focal/dmi_modalias.cfg'
--- tools/boot/focal/dmi_modalias.cfg	1970-01-01 00:00:00 +0000
+++ tools/boot/focal/dmi_modalias.cfg	2020-03-24 15:59:51 +0000
@@ -0,0 +1,28 @@
+# grub dmi modalias generator. buggy.
+#
+# (C) 2020 Canonical Ltd.
+# SPDX-License-Identifier: GPL-2.0
+
+insmod smbios
+
+# Extract dmi information
+
+smbios --type 0 --get-string 4 --linux --set dmi_bvn        # DMI_BIOS_VENDOR
+smbios --type 0 --get-string 5 --linux --set dmi_bvr        # DMI_BIOS_VERSION
+smbios --type 0 --get-string 8 --linux --set dmi_bd         # DMI_BIOS_DATE
+
+smbios --type 1 --get-string 4 --linux --set dmi_svn        # DMI_SYS_VENDOR
+smbios --type 1 --get-string 5 --linux --set dmi_pn         # DMI_PRODUCT_NAME
+smbios --type 1 --get-string 6 --linux --set dmi_pvr        # DMI_PRODUCT_VERSION
+
+smbios --type 2 --get-string 4 --linux --set dmi_rvn        # DMI_BOARD_VENDOR
+smbios --type 2 --get-string 5 --linux --set dmi_rn         # DMI_BOARD_NAME
+smbios --type 2 --get-string 6 --linux --set dmi_rvr        # DMI_BOARD_VERSION
+
+smbios --type 3 --get-string 4 --linux --set dmi_cvn        # DMI_CHASSIS_VENDOR
+smbios --type 3 --get-byte   5         --set dmi_ct         # DMI_CHASSIS_TYPE
+smbios --type 3 --get-string 6 --linux --set dmi_cvr        # DMI_CHASSIS_VERSION
+
+# Construct a modalias string
+
+set dmi_modalias="dmi:bvn${dmi_bvn}:bvr${dmi_bvr}:bd${dmi_bd}:svn${dmi_svn}:pn${dmi_pn}:pvr${dmi_pvr}:rvn${dmi_rvn}:rn${dmi_rn}:rvr${dmi_rvr}:cvn${dmi_cvn}:ct${dmi_ct}:cvr${dmi_cvr}"