Merge lp:~xnox/debian-cd/boot-arm64-with-images into lp:~ubuntu-cdimage/debian-cd/ubuntu

[Dimitri John Ledkov]

Make use of images/ on arm64, and hopefully bring boot-arm64 in line with recent improvements to boot-amd64?

[Steve Langasek (vorlon)]

Approved, and accepted into the archive. Please push to git.

review: Approve

[Steve Langasek (vorlon)]

Er, approval was based on your statement that this corresponded to the upload in the unapproved queue. The diff here is something different?

[Steve Langasek (vorlon)]

oh right, this is the debian-cd half that /corresponds to/ the upload.

=== modified file 'tools/boot/groovy/boot-arm64'
--- tools/boot/groovy/boot-arm64	2020-06-17 19:24:11 +0000
+++ tools/boot/groovy/boot-arm64	2020-10-05 10:58:11 +0000
@@ -29,7 +29,7 @@
 mkdir cd-boot-images
 $BASEDIR/tools/apt-selection download cd-boot-images-arm64
 dpkg --fsys-tarfile cd-boot-images-arm64*_all.deb | tar xf - -C cd-boot-images
-echo -n " -J -joliet-long -l -c boot/boot.cat -partition_offset 16 -append_partition 2 0xef cd-boot-images/usr/share/cd-boot-images-arm64/tree/boot/grub/efi.img -e boot/grub/efi.img -no-emul-boot -partition_cyl_align all cd-boot-images/usr/share/cd-boot-images-arm64/tree" >> $N.mkisofs_opts
+echo -n " -J -joliet-long -l -c boot/boot.cat -partition_offset 16 -append_partition 2 0xef cd-boot-images/usr/share/cd-boot-images-arm64/images/boot/grub/efi.img -e --interval:appended_partition_2:all:: -no-emul-boot -partition_cyl_align all cd-boot-images/usr/share/cd-boot-images-arm64/tree" >> $N.mkisofs_opts
 
 # generate grub.cfg
 mkdir -p $CDDIR/boot/grub/