From 1e275b6b4634444fd4d7a93c4c20495538228f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Tue, 2 Jul 2019 11:39:07 +0200 Subject: [PATCH] Append seeded snaps to manifests for all images. --- live-build/auto/build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/live-build/auto/build b/live-build/auto/build index 6c4d684d..74630174 100755 --- a/live-build/auto/build +++ b/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