Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-08-08 07:14:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

live-build: move snap seed validation into preinstall_snaps (thanks to rcj)

Browse Source
This commit is contained in:
Michael Vogt 2019-07-15 17:32:28 +02:00
parent 8bc09a160b
commit ac717bff40
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
live-build/auto/build
View File

@ -88,6 +88,11 @@ preinstall_snaps() {
snap_preseed chroot "${snap}" snap_preseed chroot "${snap}"
done done
lb chroot_resolv remove lb chroot_resolv remove
# Do basic validation of generated snapd seed.yaml.
if [ -e chroot/var/lib/snapd/seed/seed.yaml ]; then
snap debug validate-seed chroot/var/lib/snapd/seed/seed.yaml
fi
} }
rm -f binary.success rm -f binary.success
@ -529,11 +534,6 @@ if [ -z "$PASSES" ] && [ -e "$PREFIX.manifest" ]; then
./config/snap-seed-parse "chroot/" "$PREFIX.manifest" ./config/snap-seed-parse "chroot/" "$PREFIX.manifest"
fi fi
# Do basic validation of generated snapd seed.yaml.
if [ -e chroot/var/lib/snapd/seed/seed.yaml ]; then
snap debug validate-seed chroot/var/lib/snapd/seed/seed.yaml
fi
# ubuntu-core splits kernel stuff into a "device" tarball so # 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 # at this point we reset it to "none" as all the work to extract it was done already
# in a binary hook # in a binary hook