From a9249b1773bafcbcef35a811da9d44c6fde44d66 Mon Sep 17 00:00:00 2001 From: Joshua Powers Date: Fri, 4 Dec 2020 13:26:52 -0800 Subject: [PATCH] amd64: revert all grub changes for xenial For LP: #1901906, on other releases we ensured that grub-pc is always installed with shim-signed. However, xenial has different behavior that does not work the same. This reverts those changes back to what livecd-rootfs was before any of those changes were made, keeping only the autoremove packages work. LP: #1901906 --- live-build/auto/config | 4 ++-- live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index f1fb0ad7..e8a4cdc0 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -501,9 +501,9 @@ case $PROJECT in add_package install grub-pc ;; amd64) - add_package install grub-pc - add_package install shim-signed + add_package install grub-pc-bin add_package install grub-efi-amd64-signed + add_package install shim-signed ;; armhf) add_package install flash-kernel u-boot-tools 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 9ae497fb..b04e9e58 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 @@ -86,7 +86,7 @@ install_grub() { efi_target=arm64-efi ;; amd64) - chroot mountpoint apt-get install -qqy grub-pc shim-signed grub-efi-amd64-signed + chroot mountpoint apt-get install -qqy grub-efi-amd64-signed grub-efi-amd64 shim-signed grub_modules="multiboot serial usb usb_keyboard" efi_target=x86_64-efi ;;