[Merge] ~medicalwei/livecd-rootfs:ubuntu-oem-reorg into livecd-rootfs:ubuntu/master

[Dan Bungert]

Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index ac63994..683c442 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -861,15 +871,22 @@ case $PROJECT in
>  
>  	ubuntu-oem)
>  		HAS_MINIMAL=yes
> +		HAS_HOTFIX_LAYERS=yes
> +		MINIMAL_IS_DEFAULT=no
>  		MINIMAL_NAME="Ubuntu Desktop for OEM (minimal)"
>  		MINIMAL_DESC="Ubuntu Desktop (minimal) for OEM preinstallation."
>  		STANDARD_NAME="Ubuntu Desktop for OEM"
>  		STANDARD_DESC="Ubuntu Desktop for OEM preinstallation."
>  		HAS_DEFAULT_LANGUAGES=yes
> -		#KERNEL_FLAVOURS='oem-24.04'
> -		KERNEL_FLAVOURS='generic-hwe-24.04'
> +		KERNEL_FLAVOURS=${SUBPROJECT:-generic-hwe-$(lsb_release -sr)}
>  		LOCALE_SUPPORT=none
>  		do_layered_desktop_image
> +
> +		# these are the hacks to the desktop image. these packages
> +		# should be included into ubuntu-oem seeds.
> +		add_package minimal provd
> +		CHANNEL="candidate" add_snap minimal ubuntu-desktop-init

If we use candidate channel here it will need correction later.  Would it be reasonable to promote the snaps to latest/stable/ubuntu-24.04 ?

> +		CHANNEL="candidate" add_snap minimal factory-reset-tools
>  		;;
>  
>  	kubuntu)


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