From e196306173c338c773d42d78fd432c3fbafd8008 Mon Sep 17 00:00:00 2001 From: Joshua Powers Date: Wed, 2 Dec 2020 09:55:08 -0800 Subject: [PATCH] amd64: always install grub-efi-amd64-signed shim-signed does not depend on grub-efi-amd64-signed in Xenial. Historically, Xenial did not always ship with signatures. This is different than LTSes after Xenial where this is the case. A future SRU for grub should change this, but for now ensure to install the signed package so that secure boot systems can actually boot. LP: #1901906 --- live-build/auto/config | 1 + live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 839d5a5b..f1fb0ad7 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -503,6 +503,7 @@ case $PROJECT in amd64) add_package install grub-pc add_package install shim-signed + add_package install grub-efi-amd64-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 5f5550cf..9ae497fb 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 + chroot mountpoint apt-get install -qqy grub-pc shim-signed grub-efi-amd64-signed grub_modules="multiboot serial usb usb_keyboard" efi_target=x86_64-efi ;;