Merge lp:~xnox/debian-cd/focal-boot-next-fix into lp:~ubuntu-cdimage/debian-cd/ubuntu

Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Steve Langasek
Approved revision: 2107
Merged at revision: 2107
Proposed branch: lp:~xnox/debian-cd/focal-boot-next-fix
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 12 lines (+1/-1)
1 file modified
tools/boot/focal/boot-amd64 (+1/-1)
To merge this branch: bzr merge lp:~xnox/debian-cd/focal-boot-next-fix
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+396850@code.launchpad.net

Commit message

focal: boot-amd64: fix boot from next volume

https://launchpad.net/ubuntu/+source/grub2/2.04-1ubuntu26.8 is now in focal-updates.

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

This is dependent on grub2 2.04-1ubuntu26.8 which has the fix for LP: #1865515. This version has now landed in focal-updates, so this change is safe to land.

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-amd64'
2--- tools/boot/focal/boot-amd64 2020-04-15 15:11:20 +0000
3+++ tools/boot/focal/boot-amd64 2021-01-25 16:03:19 +0000
4@@ -694,7 +694,7 @@
5 grub_platform
6 if [ "\$grub_platform" = "efi" ]; then
7 menuentry 'Boot from next volume' {
8- exit
9+ exit 1
10 }
11 menuentry 'UEFI Firmware Settings' {
12 fwsetup

Subscribers

People subscribed via source and target branches