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

[Steve Langasek]

[Steve Langasek (vorlon)]

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

=== modified file 'tools/boot/groovy/boot-amd64'
--- tools/boot/groovy/boot-amd64	2020-09-15 22:07:48 +0000
+++ tools/boot/groovy/boot-amd64	2020-09-30 21:08:13 +0000
@@ -72,14 +72,14 @@
 # We use the grub stage1 bootloader, boot_hybrid.img, which then jumps
 # to the eltorito image based on the information xorriso provides it
 # via the --grub2-boot-info option.
-mkisofs_opts --grub2-mbr cd-boot-images/usr/share/cd-boot-images-amd64/tree/boot/grub/i386-pc/boot_hybrid.img
+mkisofs_opts --grub2-mbr cd-boot-images/usr/share/cd-boot-images-amd64/images/boot/grub/i386-pc/boot_hybrid.img
 
 ## Set up the mkisofs options for UEFI boot.
 
 # To make our ESP / El-Torito image compliant with MBR/GPT standards, we
 # first append it at a partition and then point the El Torito at it.
 # See https://lists.debian.org/debian-cd/2019/07/msg00007.html
-mkisofs_opts -append_partition 2 0xef cd-boot-images/usr/share/cd-boot-images-amd64/tree/boot/grub/efi.img
+mkisofs_opts -append_partition 2 0xef cd-boot-images/usr/share/cd-boot-images-amd64/images/boot/grub/efi.img
 
 # Start a new entry in the el torito boot catalog.
 mkisofs_opts -eltorito-alt-boot