[Merge] ~mvo/livecd-rootfs:snap-validate-seed into livecd-rootfs:ubuntu/master

[Robert C Jennings]

Review: Needs Fixing



Diff comments:

> diff --git a/live-build/functions b/live-build/functions
> index 3339d72..2fbbf48 100644
> --- a/live-build/functions
> +++ b/live-build/functions
> @@ -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

chroot should be $CHROOT_ROOT in this function.  You'll get a false positive when you're testing as you'll just keep checking the initial chroot.

> +        snap debug validate-seed chroot/var/lib/snapd/seed/seed.yaml
> +    fi
>  }
>  
>  snap_from_seed() {


-- 
https://code.launchpad.net/~mvo/livecd-rootfs/+git/livecd-rootfs/+merge/370065
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.