[Merge] ~edubuntu-dev/livecd-rootfs:ubuntu/master into livecd-rootfs:ubuntu/master

[Steve Langasek]

Review: Disapprove



Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index de3ca05..35f9b48 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -353,7 +353,7 @@ _get_live_passes ()
>  
>  if [ -z "${IMAGEFORMAT:-}" ]; then
>  	case $PROJECT:${SUBPROJECT:-} in
> -		ubuntu-cpc:*|ubuntu:desktop-preinstalled|ubuntu-wsl:*)
> +		ubuntu-cpc:*|ubuntu:desktop-preinstalled|edubuntu:preinstalled|ubuntu-wsl:*)

This is the chunk that, as discussed, should be unnecessary because this should be declared in the livefs metadata and not elsewhere.

>  			case $ARCH+${SUBARCH:-} in
>  				arm64+raspi)
>  					# All raspi images use ubuntu-image.
> @@ -799,35 +799,58 @@ case $PROJECT in
>  		;;
>  
>  	edubuntu)
> -		# Edubuntu now ships the new installer.
> -		touch config/universe-enabled
> -		PASSES_TO_LAYERS="true"
> -		KERNEL_FLAVOURS=generic
> -		add_task minimal minimal standard edubuntu-desktop-gnome-minimal
> -		add_task minimal.standard edubuntu-desktop-gnome
> -		add_task minimal.standard.live edubuntu-live
> -		add_package minimal.standard.live linux-$KERNEL_FLAVOURS casper
> -		cat <<-EOF > config/minimal.catalog-in.yaml
> -			name: "Edubuntu Desktop (minimized)"
> -			description: >-
> -			  A minimal installation of the Edubuntu Desktop.
> -			id: edubuntu-desktop-minimal
> -			type: fsimage-layered
> -			variant: desktop
> -			locale_support: langpack
> -		EOF
> -		cat <<-EOF > config/minimal.standard.catalog-in.yaml
> -			name: "Edubuntu Desktop"
> -			description: >-
> -			  A full featured Edubuntu Desktop.
> -			id: edubuntu-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
> +		case ${SUBPROJECT:-} in
> +			preinstalled)
> +				add_task install minimal standard edubuntu-desktop-raspi
> +				case $SUBARCH in
> +					raspi)
> +						add_task install edubuntu-desktop-raspi
> +						# XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project
> +						#  for existing raspi preinstalled images
> +						# XXX: I would prefer to use --hdd-label=desktop-rootfs like 040-hyperv-desktop-images.binary
> +						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"
> +					;;
> +					*)
> +						## *crickets*
> +					;;
> +				esac

all of the above is in fact unnecessary because it will only be used when building images without use of ubuntu-image.

> +			;;
> +			*)
> +				# Edubuntu now ships the new installer.
> +				touch config/universe-enabled
> +				PASSES_TO_LAYERS="true"
> +				KERNEL_FLAVOURS=generic
> +				add_task minimal minimal standard edubuntu-desktop-gnome-minimal
> +				add_task minimal.standard edubuntu-desktop-gnome
> +				add_task minimal.standard.live edubuntu-live
> +				add_package minimal.standard.live linux-$KERNEL_FLAVOURS casper
> +				cat <<-EOF > config/minimal.catalog-in.yaml
> +					name: "Edubuntu Desktop (minimized)"
> +					description: >-
> +					A minimal installation of the Edubuntu Desktop.
> +					id: edubuntu-desktop-minimal
> +					type: fsimage-layered
> +					variant: desktop
> +					locale_support: langpack
> +				EOF
> +				cat <<-EOF > config/minimal.standard.catalog-in.yaml
> +					name: "Edubuntu Desktop"
> +					description: >-
> +					A full featured Edubuntu Desktop.
> +					id: edubuntu-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
> +			;;
> +			esac
>  		;;
>  
>  	lubuntu|ubuntu-gnome|ubuntu-unity|ubuntucinnamon|ubuntukylin)


-- 
https://code.launchpad.net/~edubuntu-dev/livecd-rootfs/+git/livecd-rootfs/+merge/458851
Your team Edubuntu Developers is subscribed to branch ~edubuntu-dev/livecd-rootfs:ubuntu/master.