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

Proposed by Cody Shepherd
Status: Merged
Merged at revision: 1687
Proposed branch: lp:~codyshepherd/livecd-rootfs/uefi-manifests-bionic
Merge into: lp:~ubuntu-core-dev/livecd-rootfs/bionic-proposed
Diff against target: 16 lines (+6/-0)
1 file modified
live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary (+6/-0)
To merge this branch: bzr merge lp:~codyshepherd/livecd-rootfs/uefi-manifests-bionic
Reviewer Review Type Date Requested Status
Francis Ginther (community) Approve
Steve Langasek Pending
Review via email:

Commit message

Include grub efi packages in manifests for uefi images.

Description of the change

Include grub efi packages in manifests for uefi images.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

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

1686. By Steve Langasek

Fix Vcs-Bzr link.

Revision history for this message
Cody Shepherd (codyshepherd) wrote :
Revision history for this message
Francis Ginther (fginther) wrote :

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

review: Approve
1687. By Steve Langasek

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary'
2--- live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary 2018-03-06 12:58:38 +0000
3+++ live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary 2018-10-25 16:24:51 +0000
4@@ -93,6 +93,12 @@
5 ;;
6 esac
8+ # This call to populate the package manifest is added here to capture
9+ # grub-efi packages that otherwise would not make it into the base
10+ # manifest. filesystem.packages is moved into place via symlinking to
11+ # livecd.ubuntu-cpc.manifest by live-build/auto/build after lb_binary runs
12+ dpkg-query --show --admindir="mountpoint/var/lib/dpkg" > "binary/boot/filesystem.packages"
14 chroot mountpoint grub-install "${loop_device}" \
15 --boot-directory=/boot \
16 --efi-directory=/boot/efi \


People subscribed via source and target branches