Merge branch 'snap-validate-seed' of git+ssh://git.launchpad.net/~mvo/livecd-rootfs into ubuntu/master

u-i-cloud-init
Iain Lane 6 years ago
commit b208ded59e
No known key found for this signature in database
GPG Key ID: E352D5C51C5041D4

2
debian/control vendored

@ -34,7 +34,7 @@ Depends: ${misc:Depends},
python3-yaml, python3-yaml,
qemu-utils, qemu-utils,
rsync, rsync,
snapd, snapd (>= 2.39),
squashfs-tools (>= 1:3.3-1), squashfs-tools (>= 1:3.3-1),
sudo, sudo,
u-boot-tools [armhf arm64], u-boot-tools [armhf arm64],

@ -649,6 +649,15 @@ snap_preseed() {
touch "$CHROOT_ROOT/var/lib/snapd/seed/.snapd-explicit-install-stamp" touch "$CHROOT_ROOT/var/lib/snapd/seed/.snapd-explicit-install-stamp"
;; ;;
esac esac
# Do basic validation of generated snapd seed.yaml, doing it here
# means we catch all the places(tm) that snaps are added but the
# downside is that each time a snap is added the seed must be valid,
# i.e. snaps with bases need to add bases first etc.
if [ -e chroot/var/lib/snapd/seed/seed.yaml ]; then
snap debug validate-seed "$CHROOT_ROOT/var/lib/snapd/seed/seed.yaml"
fi
} }
snap_from_seed() { snap_from_seed() {

Loading…
Cancel
Save