Merge lp:~vorlon/debian-cd/images-not-in-tree into lp:~ubuntu-cdimage/debian-cd/ubun3

Proposed by Steve Langasek
Status: Merged
Merged at revision: 2085
Proposed branch: lp:~vorlon/debian-cd/images-not-in-tree
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 20 lines (+2/-2)
1 file modified
tools/boot/groovy/boot-amd64 (+2/-2)
To merge this branch: bzr merge lp:~vorlon/debian-cd/images-not-in-tree
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Pending
Ubuntu CD Image Team Pending
Review via email:
To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

The corresponding cd-boot-images-amd64 change has landed, so landing htis also.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/groovy/boot-amd64'
2--- tools/boot/groovy/boot-amd64 2020-09-15 22:07:48 +0000
3+++ tools/boot/groovy/boot-amd64 2020-09-30 21:08:13 +0000
4@@ -72,14 +72,14 @@
5 # We use the grub stage1 bootloader, boot_hybrid.img, which then jumps
6 # to the eltorito image based on the information xorriso provides it
7 # via the --grub2-boot-info option.
8-mkisofs_opts --grub2-mbr cd-boot-images/usr/share/cd-boot-images-amd64/tree/boot/grub/i386-pc/boot_hybrid.img
9+mkisofs_opts --grub2-mbr cd-boot-images/usr/share/cd-boot-images-amd64/images/boot/grub/i386-pc/boot_hybrid.img
11 ## Set up the mkisofs options for UEFI boot.
13 # To make our ESP / El-Torito image compliant with MBR/GPT standards, we
14 # first append it at a partition and then point the El Torito at it.
15 # See
16-mkisofs_opts -append_partition 2 0xef cd-boot-images/usr/share/cd-boot-images-amd64/tree/boot/grub/efi.img
17+mkisofs_opts -append_partition 2 0xef cd-boot-images/usr/share/cd-boot-images-amd64/images/boot/grub/efi.img
19 # Start a new entry in the el torito boot catalog.
20 mkisofs_opts -eltorito-alt-boot


People subscribed via source and target branches