From fc4dabac825ecc74e4db84e4004c771f9d595ae8 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Wed, 3 Apr 2019 11:26:07 +0000 Subject: [PATCH] Imported 2.575 No reason for CPC update specified. --- debian/changelog | 7 +++++++ live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bcaede01..552cc0ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.575) disco; urgency=medium + + [ Robert C Jennings ] + * Remove duplicate snap listings in ubuntu-cpc qcow manifest + + -- Mathieu Trudel-Lapierre Mon, 01 Apr 2019 14:29:16 -0400 + livecd-rootfs (2.574) disco; urgency=medium * Make serial-subiquity@ use the same codepath as tty1 subiquity. diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 7370fb6f..c176de46 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -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 \