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

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 <steve.langasek@ubuntu.com>  Fri, 26 Oct 2018 15:01:07 -0600
+ -- Cody Shepherd <cody.shepherd@canonical.com>  Fri, 26 Oct 2018 15:01:07 -0600
 
 livecd-rootfs (2.525.9) bionic; urgency=medium
 

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 \