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

[Robert C Jennings]

Diff comments:

> 
> === modified file 'live-build/functions'
> --- live-build/functions	2018-05-28 14:39:06 +0000
> +++ live-build/functions	2018-09-27 18:10:32 +0000
> @@ -427,6 +427,17 @@
>      local brand="$(echo $CUSTOM_BRAND_MODEL | cut -d: -f 1)"
>      local model="$(echo $CUSTOM_BRAND_MODEL | cut -d: -f 2)"
>  
> +    # Clear the assertions if a hook wants to prepare a new
> +    # assertion that isn't the default generic:generic-classic

whoops

> +    if [ -e "$model_assertion" ] ; then
> +        existing_model=$(sed -n 's/^model: \(.*\)$/\1/p' $model_assertion)
> +        existing_brand=$(sed -n 's/^brand-id: \(.*\)$/\1/p' $model_assertion)
> +        echo "snap_prepare_assertions: replacing $existing_brand:$existing_model with $brand:$model"
> +        rm "$model_assertion"
> +        rm "$account_key_assertion"
> +        rm "$account_assertion"
> +    fi
> +
>      if ! [ -e "$model_assertion" ] ; then
>          snap known --remote model series=16 \
>              model=$model brand-id=$brand \
> @@ -468,13 +479,12 @@
>  }
>  
>  snap_preseed() {
> -    # Preseed a snap in the image
> +    # Preseed a snap in the image (snap_prepare must be called once prior)

sure

>      local CHROOT_ROOT=$1
>      local SNAP=$2
>      # Per Ubuntu policy, all seeded snaps (with the exception of the core
>      # snap) must pull from stable/ubuntu-$(release_ver) as their channel.
>      local CHANNEL=${3:-"stable/ubuntu-$(release_ver)"}
>  
> -    snap_prepare $CHROOT_ROOT
>      _snap_preseed $CHROOT_ROOT $SNAP $CHANNEL
>  }


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