[Merge] ~dbungert/livecd-rootfs:lp-2055077 into livecd-rootfs:ubuntu/master

[Dan Bungert]

> Oh, I assume you checked that everything in includes.chroot.minimal.standard.live is ok for
> flavours? It looks ok to me but two people should probably think that :-)

The schemas and extensions stuff do look suspicious.   Maybe we want `rsync --ignore-existing` then people can override.



Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index d4ea76b..5168256 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -1508,6 +1508,15 @@ case $PROJECT:${SUBPROJECT:-} in
>  		;;
>  esac
>  
> +case $PROJECT:${SUBPROJECT:-} in
> +	ubuntu-oem:*|ubuntustudio-dvd:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*|xubuntu:*)

I waffled a bit on this point, I'll remove it.  The argument the other way was to make it look like above but meh.

> +		# leverage the includes from ubuntu
> +		for entry in /usr/share/livecd-rootfs/live-build/ubuntu/includes.*; do
> +			cp -af $entry config/
> +		done
> +		;;
> +esac
> +
>  case $SUBPROJECT in
>  	buildd)
>  		cp -af /usr/share/livecd-rootfs/live-build/buildd/* config/


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