Merge lp://staging/~xnox/debian-cd/fix-boot-from-next-volume into lp://staging/~ubuntu-cdimage/debian-cd/ubuntu

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 2103
Proposed branch: lp://staging/~xnox/debian-cd/fix-boot-from-next-volume
Merge into: lp://staging/~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 25 lines (+2/-2)
2 files modified
tools/boot/hirsute/boot-amd64 (+1/-1)
tools/boot/hirsute/boot-arm64 (+1/-1)
To merge this branch: bzr merge lp://staging/~xnox/debian-cd/fix-boot-from-next-volume
Reviewer Review Type Date Requested Status
Steve Langasek Needs Information
Review via email: mp+395267@code.staging.launchpad.net

Commit message

Fix boot from next volume.

Requires grub2 with the "make-exit-take-a-return-code" patch, currently in hirsute will be SRUed to focal soon.

To post a comment you must log in.
2102. By Ɓukasz Zemczak

Clean up all the things. Based on xnox's previous clean-up branch.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

cd-boot-images-amd64 12 migrated and is on the .iso now, exit 1 now works correctly.

Ditto on -arm64 8.

Please merge this.

Revision history for this message
Steve Langasek (vorlon) wrote :

this MP changes the behavior for focal, and there has not been an update of the grub package in focal since November. So I think either grub needs updated in focal first, or the MP needs adjusted to only change hirsute?

review: Needs Information
2103. By Dimitri John Ledkov <xnox@xnox-Lenovo-YOGA-C630-13Q50>

efi: fix boot from next volume

grub2 has fixed `exit` cmd to take an argument. Now it is possible to
`exit 1`, which in EFI terms is unsuccesful boot attempt, which then
results in the next BootEntry from BootOrder to be attempted.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Updated to do this for hirsute only, until grub sru is done.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches