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

Proposed by Sebastien Bacher
Status: Merged
Merged at revision: 2127
Proposed branch: lp:~seb128/debian-cd/splash-for-canary
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 22 lines (+6/-5)
1 file modified
tools/boot/impish/common.sh (+6/-5)
To merge this branch: bzr merge lp:~seb128/debian-cd/splash-for-canary
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Michael Hudson-Doyle (community) Approve
VCS imports Pending
Review via email: mp+409636@code.launchpad.net
To post a comment you must log in.
2127. By Sebastien Bacher

Tweak the kernel parameter order for canary

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

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

LGTM.

review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

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
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/impish/common.sh'
2--- tools/boot/impish/common.sh 2021-04-23 10:42:00 +0000
3+++ tools/boot/impish/common.sh 2021-10-05 08:04:31 +0000
4@@ -2,12 +2,13 @@
5 default_kernel_params() {
6 case $PROJECT in
7 ubuntu)
8- # for multi-layer images, add a kernel command line option to set layerfs-path
9- # and select the leaf filesystem to determine the list of layers to merge in
10- # an overlay and boot from.
11- KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu.seed maybe-ubiquity quiet splash --- "
12 if [ "$SUBPROJECT" = "canary" ]; then
13- KERNEL_PARAMS="layerfs-path=minimal.standard.live.squashfs ${KERNEL_PARAMS}"
14+ # for multi-layer images, add a kernel command line option to set layerfs-path
15+ # and select the leaf filesystem to determine the list of layers to merge in
16+ # an overlay and boot from.
17+ KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }layerfs-path=minimal.standard.live.squashfs maybe-ubiquity --- quiet splash"
18+ else
19+ KERNEL_PARAMS="${KERNEL_PARAMS:+$KERNEL_PARAMS }file=/cdrom/preseed/ubuntu.seed maybe-ubiquity quiet splash --- "
20 fi
21 ;;
22 ubuntukylin)

Subscribers

People subscribed via source and target branches