diff --git a/debian/changelog b/debian/changelog index d3902f89..e9a37267 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ livecd-rootfs (2.525.10) UNRELEASED; urgency=medium - * Fix Vcs-Bzr link. + * Include grub efi packages in manifests for uefi images. - -- Steve Langasek Fri, 26 Oct 2018 15:01:07 -0600 + -- Cody Shepherd Fri, 26 Oct 2018 15:01:07 -0600 livecd-rootfs (2.525.9) bionic; urgency=medium 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..7839c49e 100755 --- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary @@ -93,6 +93,12 @@ install_grub() { ;; esac + # This call to populate the package manifest is added here to capture + # grub-efi packages that otherwise would not make it into the base + # manifest. filesystem.packages is moved into place via symlinking to + # livecd.ubuntu-cpc.manifest by live-build/auto/build after lb_binary runs + dpkg-query --show --admindir="mountpoint/var/lib/dpkg" > "binary/boot/filesystem.packages" + chroot mountpoint grub-install "${loop_device}" \ --boot-directory=/boot \ --efi-directory=/boot/efi \