Merge lp:~codyshepherd/livecd-rootfs/uefi-manifests-cosmic into lp:livecd-rootfs

Proposed by Cody Shepherd
Status: Merged
Merged at revision: 1709
Proposed branch: lp:~codyshepherd/livecd-rootfs/uefi-manifests-cosmic
Merge into: lp:livecd-rootfs
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+1/-1)
live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary (+6/-0)
To merge this branch: bzr merge lp:~codyshepherd/livecd-rootfs/uefi-manifests-cosmic
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+357960@code.launchpad.net

Commit message

Changes to include grub-efi packages in manifest.

Description of the change

Changes to include grub-efi packages in manifest.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2018-10-26 20:56:42 +0000
+++ debian/changelog 2018-10-29 16:40:49 +0000
@@ -1,4 +1,4 @@
1livecd-rootfs (2.543) UNRELEASED; urgency=medium1livecd-rootfs (2.542.1) UNRELEASED; urgency=medium
22
3 * Ensure pre-seeded snaps are now published in the image manifests.3 * Ensure pre-seeded snaps are now published in the image manifests.
44
55
=== modified file 'live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary'
--- live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary 2018-06-06 22:41:30 +0000
+++ live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary 2018-10-29 16:40:49 +0000
@@ -93,6 +93,12 @@
93 ;;93 ;;
94 esac94 esac
9595
96 # This call to generate the package manifest is added here to capture
97 # grub-efi packages that otherwise would not make it into the base
98 # manifest. filesystem.packages is moved into place via symlinking to
99 # livecd.ubuntu-cpc.manifest by live-build/auto/build after lb_binary runs
100 create_manifest "mountpoint" "binary/boot/filesystem.packages"
101
96 chroot mountpoint grub-install "${loop_device}" \102 chroot mountpoint grub-install "${loop_device}" \
97 --boot-directory=/boot \103 --boot-directory=/boot \
98 --efi-directory=/boot/efi \104 --efi-directory=/boot/efi \

Subscribers

People subscribed via source and target branches