From 2646b9c459cb19160ca7b671954b7e09c234bba2 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 22 Jan 2021 19:09:25 +0000 Subject: [PATCH] esp: install grub in ubuntu bootloader id path, instead of removable. Do not use removable uefi bootloader path in the cloud-images by default, as that prevents upgrades of the bootloader. LP: #1912830 (cherry picked from commit 7c760864fdcb278ca37396f06f5e3f297428d63d) --- .../ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index cb3d9822..9f5ef890 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -212,19 +212,9 @@ EOF --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