Merge lp:~vorlon/livecd-rootfs/coinstallable-grubz

debian/changelog

@@ -2,6 +2,11 @@ livecd-rootfs (2.531) UNRELEASED; urgency=medium
 
   * ubuntu-cpc: Use linux-kvm for all amd64 minimized builds (LP: #1775472).
 
+  [ Steve Langasek ]
+  * live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary: don't manually
+    install grub-efi-amd64 since that forces off grub-pc, which is otherwise
+    now coinstallable.
+
  -- Daniel Watkins <oddbloke@ubuntu.com>  Wed, 06 Jun 2018 17:17:32 -0700
 
 livecd-rootfs (2.530) cosmic; urgency=medium

live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary

@@ -88,7 +88,7 @@ install_grub() {
             efi_target=arm-efi
             ;;
         amd64)
-            chroot mountpoint apt-get install -qqy grub-efi-amd64-signed grub-efi-amd64 shim-signed
+            chroot mountpoint apt-get install -qqy grub-efi-amd64-signed shim-signed
             efi_target=x86_64-efi
             ;;
     esac