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

[Steve Langasek]

[Dan Watkins (oddbloke)]

review: Approve

[lp:~vorlon/livecd-rootfs/coinstallable-grubz]

1677. By Adam Conrad on 2018-06-06

ubuntu-cpc: Reintroduce the -root.tar.xz artifact (LP: #1585233).

[Adam Conrad (adconrad)]

Looketh good to me.

review: Approve

[lp:~vorlon/livecd-rootfs/coinstallable-grubz]

1678. By Steve Langasek on 2018-06-07

Merge lp:~daniel-thewatkins/livecd-rootfs/1775472

1679. By Steve Langasek on 2018-06-07

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

=== modified file 'debian/changelog'
--- debian/changelog	2018-06-06 23:10:48 +0000
+++ debian/changelog	2018-06-07 00:11:46 +0000
@@ -1,3 +1,11 @@
+livecd-rootfs (2.531) UNRELEASED; urgency=medium
+
+  * 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.
+
+ -- Steve Langasek <[e-mail]>  Wed, 06 Jun 2018 15:39:27 -0700
+
 livecd-rootfs (2.530) cosmic; urgency=medium
 
   * ubuntu-cpc: Reintroduce the -root.tar.xz artifact (LP: #1585233).
 
=== modified file 'live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary'
--- live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary	2018-03-06 12:58:38 +0000
+++ live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary	2018-06-07 00:11:46 +0000
@@ -88,7 +88,7 @@
             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