Merge lp:~xnox/debian-cd/ubuntu-oem-kernel-flavour-cmdline-param into lp:~ubuntu-cdimage/debian-cd/ubun3

Proposed by Dimitri John Ledkov
Status: Rejected
Rejected by: Iain Lane
Proposed branch: lp:~xnox/debian-cd/ubuntu-oem-kernel-flavour-cmdline-param
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 76 lines (+10/-8)
1 file modified
tools/boot/focal/boot-amd64 (+10/-8)
To merge this branch: bzr merge lp:~xnox/debian-cd/ubuntu-oem-kernel-flavour-cmdline-param
Reviewer Review Type Date Requested Status
Iain Lane Needs Fixing
Canonical Desktop Team Pending
Review via email: mp+381824@code.launchpad.net

Commit message

boot-amd64: export ubuntu-oem-kernel-flavour as cmdline param.

boot-amd64: do not boot oem flavour, but still pass it as cmdline param.

Description of the change

boot-amd64: export ubuntu-oem-kernel-flavour as cmdline param.

boot-amd64: do not boot oem flavour, but still pass it as cmdline param.

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

I don't think we need this atm.

Revision history for this message
Iain Lane (laney) wrote :

We've changed direction and we're going to always boot the default kernel now, so the original commit should be reverted instead I think.

review: Needs Fixing

Unmerged revisions

2049. By Dimitri John Ledkov

boot-amd64: do not boot oem flavour, but still pass it as cmdline param.

2048. By Dimitri John Ledkov

boot-amd64: export ubuntu-oem-kernel-flavour as cmdline param.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/focal/boot-amd64'
2--- tools/boot/focal/boot-amd64 2020-04-01 10:28:48 +0000
3+++ tools/boot/focal/boot-amd64 2020-04-07 15:02:22 +0000
4@@ -322,9 +322,11 @@
5 # dmi_modalias variable that dmi_modalias.cfg generated for us.
6 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
7 set casper_flavour=""
8+set casper_flavour_param=""
9 source \$prefix/dmi_modalias.cfg
10 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
11- set casper_flavour="-oem"
12+ set casper_flavour=""
13+ set casper_flavour_param=" ubuntu-oem-kernel-flavour=oem"
14 fi
15 EOF
16
17@@ -478,7 +480,7 @@
18 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
19 menuentry "${livelabel#^}${suffix}" {
20 set gfxpayload=keep
21- linux $CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT $QUIET $SPLASH$extra_kopt ---
22+ linux $CASPER_KERNEL\$casper_flavour\$casper_flavour_param $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT $QUIET $SPLASH$extra_kopt ---
23 initrd $CASPER_INITRD\$casper_flavour
24 }
25 EOF
26@@ -486,7 +488,7 @@
27 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
28 menuentry "${livelabel#^}" {
29 set gfxpayload=keep
30- linux $CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
31+ linux $CASPER_KERNEL\$casper_flavour\$casper_flavour_param $KERNEL_PARAMS $DEFAULT_PRESEED$liveparams$LAYERFS_PATH_OPT iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
32 initrd $CASPER_INITRD\$casper_flavour
33 }
34 EOF
35@@ -503,14 +505,14 @@
36 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
37 menuentry "Install $HUMANPROJECT${suffix}" {
38 set gfxpayload=keep
39- linux $CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity $QUIET $SPLASH$extra_kopt ---
40+ linux $CASPER_KERNEL\$casper_flavour\$casper_flavour_param $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity $QUIET $SPLASH$extra_kopt ---
41 initrd $CASPER_INITRD\$casper_flavour
42 }
43 EOF
44 done
45 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
46 menuentry "Install $HUMANPROJECT" {
47- linux $CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
48+ linux $CASPER_KERNEL\$casper_flavour\$casper_flavour_param $KERNEL_PARAMS $DEFAULT_PRESEED$LAYERFS_PATH_OPT only-ubiquity iso-scan/filename=\${iso_path} $QUIET $SPLASH ---
49 initrd $CASPER_INITRD\$casper_flavour
50 }
51 EOF
52@@ -592,7 +594,7 @@
53 cat >> $CDDIR/boot/grub/${!kp}grub.cfg <<EOF
54 menuentry "OEM install (for manufacturers)" {
55 set gfxpayload=keep
56- 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 ---
57+ linux $CASPER_KERNEL\$casper_flavour\$casper_flavour_param $KERNEL_PARAMS ${DEFAULT_PRESEED/$PREFIX_PRESEED/$PREFIX_PRESEED${!kp}}$LAYERFS_PATH_OPT only-ubiquity quiet splash oem-config/enable=true ---
58 initrd $CASPER_INITRD\$casper_flavour
59 }
60 EOF
61@@ -654,13 +656,13 @@
62 cat >> $CDDIR/boot/grub/grub.cfg <<EOF
63 menuentry "Check disc for defects" {
64 set gfxpayload=keep
65- linux $CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check quiet splash ---
66+ linux $CASPER_KERNEL\$casper_flavour\$casper_flavour_param $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check quiet splash ---
67 initrd $CASPER_INITRD\$casper_flavour
68 }
69 EOF
70 cat >> $CDDIR/boot/grub/loopback.cfg <<EOF
71 menuentry "Check disc for defects" {
72- linux $CASPER_KERNEL\$casper_flavour $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check iso-scan/filename=\${iso_path} quiet splash ---
73+ linux $CASPER_KERNEL\$casper_flavour\$casper_flavour_param $KERNEL_PARAMS$LAYERFS_PATH_OPT integrity-check iso-scan/filename=\${iso_path} quiet splash ---
74 initrd $CASPER_INITRD\$casper_flavour
75 }
76 EOF

Subscribers

People subscribed via source and target branches