[Merge] livecd-rootfs:raspi-desktop-1 into livecd-rootfs:ubuntu/master

[Iain Lane]

ah yeah, it's being included explicitly - copy/paste error?

Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index 89e2527..7c4a667 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -597,6 +603,21 @@ case $PROJECT in
>  				remove_packages_from_seed_regexp minimal.standard desktop-default-languages '^desktop-(?!default-languages|minimal|common)[^.]+$'
>  				remove_packages_from_seed_regexp minimal.standard desktop-default-languages ''  # none (if no default langpack is selected)
>  				;;
> +
> +			desktop-preinstalled)
> +				add_task install minimal standard cloud-image

Drop cloud-image here, I think.

> +				if [ "$SUBARCH" = "raspi" ]; then
> +					add_task install ubuntu-desktop-raspi
> +				fi
> +				# XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project
> +				#  for existing raspi preinstalled images
> +				OPTS="${OPTS:+$OPTS }--initramfs=none"
> +				OPTS="${OPTS:+$OPTS }--system=normal"
> +				OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
> +				OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
> +				OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
> +				;;
> +
>  			*)
>  				LIVE_TASK='ubuntu-live'
>  				add_task install minimal standard ubuntu-desktop


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