Merge lp://staging/~xnox/debian-cd/no-try-only-do-in-grub into lp://staging/~ubuntu-cdimage/debian-cd/ubun3
Proposed by
Dimitri John Ledkov
| Status: | Merged |
|---|---|
| Merged at revision: | 2052 |
| Proposed branch: | lp://staging/~xnox/debian-cd/no-try-only-do-in-grub |
| Merge into: | lp://staging/~ubuntu-cdimage/debian-cd/ubun3 |
| Diff against target: |
76 lines (+21/-4) 1 file modified
tools/boot/focal/boot-amd64 (+21/-4) |
| To merge this branch: | bzr merge lp://staging/~xnox/debian-cd/no-try-only-do-in-grub |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Wimpress (community) | Approve | ||
| Ubuntu CD Image Team | Pending | ||
|
Review via email:
|
|||
Commit message
focal: boot-amd64: allow different behaviour in isolinux & grub, w.r.t notry
Allow isolinux & grub labels and kernel-arg to be different. By default, keep them the same.
Allow doing NOTRYONLYDO mode, but just for grub, whilst keeping bios mode the same, with NOTRYONLYDOINGRUB.
Make Ubuntu flavour use NOTRYONLYDOINGRUB, such that isolinux remains the same, but under grub the only boot entry is "maybe-ubiquity" one.
This is work-in-progress, as I still need to test build a desktop ISO with this code, and check that ubuntu flavour works correctly and non-ubuntu flavour works correctly too.
To post a comment you must log in.
Revision history for this message
| Dimitri John Ledkov (xnox) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Bios boot remains the same, all options work, and translations preserved.
UEFI boot works as intended and goes into maybe-ubiquity mode, as per design review between Wimpress & mpt.