Merge lp:~seb128/debian-cd/layerfs-canary-option into lp:~ubuntu-cdimage/debian-cd/ubuntu

[Sebastien Bacher]

Correctly set the layerfs kernel option for the canary image

The option got broken previous cycle due to some refactoring

The option was broken by https://code.launchpad.net/~xnox/debian-cd/cd-boot-images-amd64/+merge/386094

[Łukasz Zemczak (sil2100)]

Thanks! This looks fine. I'll apply Dimitri's proposition as I like his attention to decreasing the overall-present duplication in our builder code!

review: Approve

=== modified file 'tools/boot/hirsute/common.sh'
--- tools/boot/hirsute/common.sh	2020-10-23 15:26:45 +0000
+++ tools/boot/hirsute/common.sh	2020-11-18 20:08:23 +0000
@@ -2,7 +2,14 @@
 default_kernel_params() {
     case $PROJECT in
         ubuntu)
-            KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu.seed maybe-ubiquity quiet splash --- "
+            # 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.
+            if [ "$SUBPROJECT" = "canary" ]; then
+                KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu.seed 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)
             KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu.seed locale=zh_CN keyboard-configuration/layoutcode?=cn maybe-ubiquity quiet splash --- "
@@ -178,18 +185,3 @@
    fi
 }
 
-# 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.
-add_layerfs_path_opt() {
-    case $PROJECT in
-	ubuntu)
-		if [ "$SUBPROJECT" = "canary" ]; then
-	    	echo ' layerfs-path=minimal.standard.live.squashfs'
-			return
-		fi
-	    ;;
-	*)
-		;;
-	esac
-}