Imported 2.601

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2019-07-16 18:00:06 +00:00
parent 3ae4e475e4
commit 19ee0913d6
3 changed files with 18 additions and 1 deletions

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.601) eoan; urgency=medium
[ Michael Vogt ]
* Run "snap debug validate-seed" during preseeding to do basic validation of
the generated seed.yaml
-- Iain Lane <iain.lane@canonical.com> Tue, 16 Jul 2019 11:30:27 +0100
livecd-rootfs (2.600) eoan; urgency=medium
[ Tobias Koch ]

2
debian/control vendored
View File

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

View File

@ -649,6 +649,15 @@ snap_preseed() {
touch "$CHROOT_ROOT/var/lib/snapd/seed/.snapd-explicit-install-stamp"
;;
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() {