Merge lp:~seb128/debian-cd/splash-for-canary into lp:~ubuntu-cdimage/debian-cd/ubuntu

[Sebastien Bacher]

[lp:~seb128/debian-cd/splash-for-canary]

2127. By Sebastien Bacher on 2021-10-05

Tweak the kernel parameter order for canary

The splash option needs to be at the end of the line to be copied

[Michael Hudson-Doyle (mwhudson)]

LGTM.

review: Approve

[Łukasz Zemczak (sil2100)]

Just making sure, since this changes the KERNEL_PARAMS for the canary case a bit - we don't use the 'file=/cdrom/preseed/ubuntu.seed' cmdline for the canary images? Since previously it was still included as we were only prepending layerfs-path to an existing KERNEL_PARAMS, but now we don't. I don't know enough about canary to know if that's all okay

review: Needs Information

[Łukasz Zemczak (sil2100)]

Okay, I have been told by Michael that it's not relevant for canary - so let's get this merged then. It was probably preserved in the past unintentionally.

review: Approve

=== modified file 'tools/boot/impish/common.sh'
--- tools/boot/impish/common.sh	2021-04-23 10:42:00 +0000
+++ tools/boot/impish/common.sh	2021-10-05 08:04:31 +0000
@@ -2,12 +2,13 @@
 default_kernel_params() {
     case $PROJECT in
         ubuntu)
-            # for multi-layer images, add a kernel command line option to set layerfs-path
-            # and select the leaf filesystem to determine the list of layers to merge in
-            # an overlay and boot from.
-            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu.seed maybe-ubiquity quiet splash --- "
             if [ "$SUBPROJECT" = "canary" ]; then
-                KERNEL_PARAMS="layerfs-path=minimal.standard.live.squashfs ${KERNEL_PARAMS}"
+                # for multi-layer images, add a kernel command line option to set layerfs-path
+                # and select the leaf filesystem to determine the list of layers to merge in
+                # an overlay and boot from.
+                KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }layerfs-path=minimal.standard.live.squashfs maybe-ubiquity --- quiet splash"
+            else
+                KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu.seed maybe-ubiquity quiet splash --- "
             fi
             ;;
         ubuntukylin)