Merge lp:~mwhudson/debian-cd/lp-1922392-focal into lp:~ubuntu-cdimage/debian-cd/ubuntu

Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Steve Langasek
Approved revision: 2123
Merged at revision: 2123
Proposed branch: lp:~mwhudson/debian-cd/lp-1922392-focal
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 12 lines (+1/-1)
1 file modified
tools/boot/focal/boot-s390x (+1/-1)
To merge this branch: bzr merge lp:~mwhudson/debian-cd/lp-1922392-focal
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+406793@code.launchpad.net

Commit message

remove quiet from the live server command line on focal/s390x

As requested in https://bugs.launchpad.net/bugs/1922392

Description of the change

could we get this done in time for 20.04.3 please?

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/focal/boot-s390x'
2--- tools/boot/focal/boot-s390x 2021-01-29 18:01:27 +0000
3+++ tools/boot/focal/boot-s390x 2021-08-08 11:38:02 +0000
4@@ -57,7 +57,7 @@
5
6 # For server-live images, use casper's initrd and kernel instead
7 if [ "$CDIMAGE_LIVE" = 1 ]; then
8- CMDLINE="$LAYERFS_PATH_OPT --- quiet"
9+ CMDLINE="$LAYERFS_PATH_OPT ---"
10 mv $CDDIR/casper/filesystem.initrd-generic $imagedir/initrd.ubuntu
11 mv $CDDIR/casper/filesystem.kernel-generic $imagedir/kernel.ubuntu
12 echo "$CMDLINE" > $imagedir/parmfile.ubuntu

Subscribers

People subscribed via source and target branches