From e2fd168f504d9debc495663ce2698166880c94c6 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 28 Oct 2020 22:27:05 +0000 Subject: [PATCH 1/2] amd64: always install grub-pc with shim-signed shim-signed depends on grub-efi-amd64-signed, which in turn has alternative depends on either `grub-efi-amd64 | grub-pc`. However to support booting with either via shim&signed-grub and BIOS, the choice must be made to install grub-pc, not grub-efi-amd64. This makes images consistent with Ubuntu Deskop, Live Server, buildd bootable images; all of which already do install grub-pc and shim-signed. LP: #1901906 --- live-build/auto/config | 3 +-- live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index 444f0abd..e95d5a88 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -778,8 +778,7 @@ case $PROJECT in add_package install grub-pc ;; amd64) - add_package install grub-pc-bin - add_package install grub-efi-amd64-signed + add_package install grub-pc add_package install shim-signed ;; esac 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 674d795a..f997bb4e 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 @@ -89,7 +89,7 @@ install_grub() { efi_target=arm-efi ;; amd64) - chroot mountpoint apt-get install -qqy shim-signed + chroot mountpoint apt-get install -qqy grub-pc shim-signed efi_target=x86_64-efi ;; esac From 0f7c511892f54d22b3e5de21b5ea4165f5cc3825 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 28 Oct 2020 22:30:42 +0000 Subject: [PATCH 2/2] amd64: always install grub-pc with shim-signed (LP: #1901906) --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7e9669bb..c18e1f99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.698) UNRELEASED; urgency=medium + + * amd64: always install grub-pc with shim-signed (LP: #1901906) + + -- Dimitri John Ledkov Wed, 28 Oct 2020 22:30:24 +0000 + livecd-rootfs (2.697) hirsute; urgency=medium [ John Chittum ]