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.
This commit is contained in:
Steve Langasek 2018-06-06 15:41:30 -07:00
parent 027ea79085
commit 92497af14f
2 changed files with 9 additions and 1 deletions

8
debian/changelog vendored
View File

@ -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 <steve.langasek@ubuntu.com> 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

View File

@ -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