Merge lp:~codyshepherd/livecd-rootfs/uefi-manifests-bionic into lp:~ubuntu-core-dev/livecd-rootfs/bionic-proposed

[Cody Shepherd]

Include grub efi packages in manifests for uefi images.

Include grub efi packages in manifests for uefi images.

[Steve Langasek (vorlon)]

This looks fine, but we need a corresponding MP for the trunk branch first

[lp:~codyshepherd/livecd-rootfs/uefi-manifests-bionic]

1686. By Steve Langasek on 2018-10-26

Fix Vcs-Bzr link.

[Cody Shepherd (codyshepherd)]

Cosmic changes proposed against trunk: https://code.launchpad.net/~codyshepherd/livecd-rootfs/uefi-manifests-cosmic/+merge/357960

[Francis Ginther (fginther)]

Looks good, has landed in both trunk and cosmic-proposed.

review: Approve

[lp:~codyshepherd/livecd-rootfs/uefi-manifests-bionic]

1687. By Steve Langasek on 2018-10-29

Merge lp:~codyshepherd/livecd-rootfs/uefi-manifests-bionic

=== 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-10-25 16:24:51 +0000
@@ -93,6 +93,12 @@
             ;;
     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 \