diff --git a/debian/changelog b/debian/changelog index 21115c0f..bd2b261a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.529) 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 Wed, 06 Jun 2018 15:39:27 -0700 + livecd-rootfs (2.528) cosmic; urgency=medium * Don't divert grub-probe; otherwise we're missing the filesystem UUIDs that diff --git a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary index 83cc466d..56328150 100755 --- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary +++ b/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