diff -Nru livecd-rootfs-2.664.47/debian/changelog livecd-rootfs-2.664.48/debian/changelog --- livecd-rootfs-2.664.47/debian/changelog 2023-03-20 23:19:05.000000000 +0000 +++ livecd-rootfs-2.664.48/debian/changelog 2023-05-19 07:09:01.000000000 +0000 @@ -1,3 +1,13 @@ +livecd-rootfs (2.664.48) focal; urgency=medium + + * Drop use of --removable flag to grub-install from + live-build/buildd/hooks/02-disk-image-uefi.binary, to match the cloud + images (7c760864fdcb278ca37396f06f5e3f297428d63d). This fixes + bootloader updates in the buildd images, but also fixes compatibility + with using devtmpfs for losetup. + + -- Steve Langasek Fri, 19 May 2023 00:09:01 -0700 + livecd-rootfs (2.664.47) focal; urgency=medium * disk-image-uefi: bump armhf size. (LP: #2011739) diff -Nru livecd-rootfs-2.664.47/live-build/buildd/hooks/02-disk-image-uefi.binary livecd-rootfs-2.664.48/live-build/buildd/hooks/02-disk-image-uefi.binary --- livecd-rootfs-2.664.47/live-build/buildd/hooks/02-disk-image-uefi.binary 2023-02-01 15:42:54.000000000 +0000 +++ livecd-rootfs-2.664.48/live-build/buildd/hooks/02-disk-image-uefi.binary 2023-05-19 07:05:58.000000000 +0000 @@ -102,19 +102,9 @@ --boot-directory=/boot \ --efi-directory=/boot/efi \ --target=${efi_target} \ - --removable \ --uefi-secure-boot \ --no-nvram - if [ -f mountpoint/boot/efi/EFI/BOOT/grub.cfg ]; then - sed -i "s| root| root hd0,gpt1|" mountpoint/boot/efi/EFI/BOOT/grub.cfg - sed -i "1i${IMAGE_STR}" mountpoint/boot/efi/EFI/BOOT/grub.cfg - # For some reason the grub disk is looking for /boot/grub/grub.cfg on - # part 15.... - chroot mountpoint mkdir -p /boot/efi/boot/grub - chroot mountpoint cp /boot/efi/EFI/BOOT/grub.cfg /boot/efi/boot/grub - fi - if [ "$ARCH" = "amd64" ]; then # Install the BIOS/GPT bits. Since GPT boots from the ESP partition, # it means that we just run this simple command and we're done