Imported 2.599

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.599) eoan; urgency=medium
+
+  * Append the list of seeded snaps to manifests for all regular images.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Tue, 02 Jul 2019 11:39:11 +0200
+
 livecd-rootfs (2.598) eoan; urgency=medium
 
   * Change minimize-manual to read package section from version instead

live-build/auto/build

@@ -511,7 +511,6 @@ fi
 
 # '--initramfs none' produces different manifest names.
 if [ -e "binary/$INITFS/filesystem.packages" ]; then
-	./config/snap-seed-parse "chroot/" "binary/${INITFS}/filesystem.packages"
 	ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest"
 	chmod 644 "$PREFIX.manifest"
 fi
@@ -523,6 +522,13 @@ if [ -e "binary/$INITFS/filesystem.packages-remove" ]; then
 	fi
 fi
 
+# Since snaps are now Ubuntu first-class citizen, so always try fetching the
+# list of seeded snaps into the manifest.  In case of layered images we skip
+# this step, as we assume they're doing it on their own at some earlier stage.
+if [ -z "$PASSES" ] && [ -e "$PREFIX.manifest" ]; then
+	./config/snap-seed-parse "chroot/" "$PREFIX.manifest"
+fi
+
 # ubuntu-core splits kernel stuff into a "device" tarball so
 # at this point we reset it to "none" as all the work to extract it was done already
 # in a binary hook