Merge branch 'shim-signed-wants-pc' of https://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master

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 <xnox@ubuntu.com>  Wed, 28 Oct 2020 22:30:24 +0000
+
 livecd-rootfs (2.697) hirsute; urgency=medium
 
   [ John Chittum ]

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

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