debian-cd

Merge ~mwhudson/debian-cd/+git/ubuntu:fix-loopback.cfg into ~ubuntu-cdimage/debian-cd/+git/ubuntu:main

  1. Git
  2. lp:~mwhudson/debian-cd/+git/ubuntu
  3. fix-loopback.cfg
  4. Merge into main
Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Steve Langasek
Approved revision: e2c37c063954ed8e079299a1dd1aad72fb94dffc
Merged at revision: e2c37c063954ed8e079299a1dd1aad72fb94dffc
Proposed branch: ~mwhudson/debian-cd/+git/ubuntu:fix-loopback.cfg
Merge into: ~ubuntu-cdimage/debian-cd/+git/ubuntu:main
Diff against target: 13 lines (+1/-1)
1 file modified
tools/boot/mantic/boot-amd64 (+1/-1)
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+445395@code.launchpad.net

Commit message

fix boot/grub/loopback.cfg for server ISOs

This was broken way back when when we dropped "quiet" from the default
kernel command line for server ISOs. Use --- as the hook for adding new
kernel command line arguments instead.

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

Thanks. We should also fix this in jammy (which is a separate file, yay). I'll take care of cloning the change.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tools/boot/mantic/boot-amd64 b/tools/boot/mantic/boot-amd64
2index 43c4aee..416215f 100755
3--- a/tools/boot/mantic/boot-amd64
4+++ b/tools/boot/mantic/boot-amd64
5@@ -170,7 +170,7 @@ fi
6 # Super GRUB Disk.
7 sed < $CDDIR/boot/grub/grub.cfg > $CDDIR/boot/grub/loopback.cfg \
8 -e '1,/menu_color_highlight/d; /grub_platform/,$d' \
9- -e '/linux/ s,quiet,iso-scan/filename=${iso_path} &,'
10+ -e '/linux/ s,---,iso-scan/filename=${iso_path} &,'
11
12 # UEFI Entries
13 cat >> $CDDIR/boot/grub/grub.cfg <<EOF

Subscribers

People subscribed via source and target branches