Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-05 16:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

ubuntu-cpc: avoid duplicate snaps listed in qcow manifest

Browse Source 
commit a993592 introduced an additional call to create_manifest
(and snap-seed-parse) to write binary/boot/filesystem.packages. This
caused duplicate snap lines in the qcow manifest. This is because the
live-build/auto/binary code assumes that after 'lb binary' is run the
filesystem.packages will only have debs and it calls snap-seed-parse to
add them to the file. The commit changed filesystem.packages in the
ubuntu-cpc uefi binary hook to include debs and snaps.

This patch keeps the intent of the prior patch, updating the
filesystem.packages file for the content of the uefi disk image, but
only writes a listing of debian packages to match the expected content
of filesystem.packages.  The snaps will still be added in generic code
in live-build/auto/build.
This commit is contained in:
Robert C Jennings 2019-03-29 15:32:50 -05:00
parent 2db7f01a58
commit a45342f269
No known key found for this signature in database
GPG Key ID: 740C3D9EEDF2ED73
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.574ubuntu1) UNRELEASED; urgency=medium
* Remove duplicate snap listings in ubuntu-cpc qcow manifest
-- Robert C Jennings <robert.jennings@canonical.com> Fri, 29 Mar 2019 15:39:13 -0500
livecd-rootfs (2.574) disco; urgency=medium
* Make serial-subiquity@ use the same codepath as tty1 subiquity.

7
live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
View File

@ -93,11 +93,14 @@ install_grub() {
;;
esac
# This call to generate the package manifest is added here to capture
# This call to rewrite the debian 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
create_manifest "mountpoint" "binary/boot/filesystem.packages"
# and at that time snaps are added to the manifest (create-manifest is
# not called here as it calls snap-seed-parse, resulting in duplicate
# snap listings)
chroot mountpoint dpkg-query -W > binary/boot/filesystem.packages
chroot mountpoint grub-install "${loop_device}" \
--boot-directory=/boot \