[Merge] ~ubuntustudio-dev/livecd-rootfs:studio-new-installer into livecd-rootfs:ubuntu/master

[Steve Langasek]

Review: Needs Fixing



Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index 20e280b..907def6 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -846,8 +846,28 @@ case $PROJECT in
>  		;;
>  
>  	ubuntustudio-dvd)
> -		add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography
> +		# By default Ubuntu Studio now ships the new installer.
> +		touch config/universe-enabled
> +		PASSES_TO_LAYERS="true"
>  		KERNEL_FLAVOURS=lowlatency
> +		add_task standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography

you actually do need to list 'minimal standard' tasks here though too.

> +		add_task standard.live ubuntustudio-live
> +		add_package cloud-init

you need to say what layer you're adding this in (or: put it in the seed)

> +		remove_package standard.live ubiquity-fronted-gtk
> +		add_snap standard.live ubuntustudio-system-installer/classic
> +		add_package standard.live linux-$KERNEL_FLAVOURS casper

Again, the above three lines belong in the seeds, not in livecd-rootfs code

> +		cat <<-EOF > config/standard.catalog-in.yaml
> +			name: "Ubuntu Studio Desktop"
> +			description: >-
> +			  A full featured Ubuntu Studio Desktop.
> +			id: ubuntustudio-desktop
> +			type: fsimage-layered
> +			variant: desktop
> +			locale_support: langpack
> +			default: yes
> +		EOF
> +		/usr/share/livecd-rootfs/checkout-translations-branch \
> +			https://git.launchpad.net/subiquity po config/catalog-translations
>  		;;
>  
>  	ubuntu-server)


-- 
https://code.launchpad.net/~ubuntustudio-dev/livecd-rootfs/+git/livecd-rootfs/+merge/456901
Your team Ubuntu Studio Development is subscribed to branch ~ubuntustudio-dev/livecd-rootfs:studio-new-installer.