[Merge] lp:~rcj/livecd-rootfs/livecd-rootfs into lp:livecd-rootfs

[Robert C Jennings]

Reviewers: please note in r1652 

Diff comments:

> === modified file 'live-build/auto/build'
> --- live-build/auto/build	2018-03-27 19:12:26 +0000
> +++ live-build/auto/build	2018-04-07 01:15:16 +0000
> @@ -384,26 +355,6 @@
>  	case $PROJECT:$SUBPROJECT in
>  		*)
>  			if [ -e "config/seeded-snaps" ]; then
> -				assertions_dir="chroot/var/lib/snapd/seed/assertions"
> -				model_assertion="$assertions_dir/generic-classic.model"
> -				account_key_assertion="$assertions_dir/generic.account-key"
> -				account_assertion="$assertions_dir/generic.account"
> -
> -				mkdir -p "$assertions_dir"
> -				snap known --remote model series=16 \
> -					model=generic-classic brand-id=generic \
> -					> "$model_assertion"
> -				account_key=$(sed -n -e's/sign-key-sha3-384: //p' \
> -					< "$model_assertion")
> -
> -				snap known --remote account-key \
> -					public-key-sha3-384="$account_key" \
> -					> "$account_key_assertion"
> -				account=$(sed -n -e's/account-id: //p' \
> -					< "$account_key_assertion")
> -
> -				snap known --remote account account-id=generic \

Reviewers: please note that this had been ignoring the value set 2 lines above and using "generic".  When this is pulled out into live-build/functions it is corrected to use account-id=$account.  The value, in my testing, still happens to be "generic" and everything is working, but now it uses the value from the 'snap known account-key...'

> -					> "$account_assertion"
>  				snap_list=$(cat config/seeded-snaps)
>  				preinstall_snaps $snap_list
>  			fi


-- 
https://code.launchpad.net/~rcj/livecd-rootfs/livecd-rootfs/+merge/342554
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~rcj/livecd-rootfs/livecd-rootfs into lp:livecd-rootfs.