[Merge] ~edubuntu-dev/ubuntu-cdimage:main into ubuntu-cdimage:main

[Steve Langasek]

Review: Needs Fixing



Diff comments:

> diff --git a/etc/default-arches b/etc/default-arches
> index 3dada71..dcb21d6 100644
> --- a/etc/default-arches
> +++ b/etc/default-arches
> @@ -24,6 +24,9 @@ ubuntu-appliance	daily-live		bionic-			amd64+appliance-adguard-home-core18-amd64
>  kubuntu			daily-live		bionic			amd64 i386
>  kubuntu			daily-live		focal-			amd64
>  
> +edubuntu		daily-live		noble-			amd64

This is not necessary for adding the new image; if the daily-live image is already being built for the right architectures, do not add this.

> +edubuntu-desktop-preinstalled	daily-preinstalled	noble-	arm64+raspi
> +

I can't work out why ubuntu daily-preinstalled images are called 'ubuntu-desktop-preinstalled' here instead of just 'ubuntu'.  I would suggest we try this first with 'edubuntu' instead and see what we get as a result.  Note that Ubuntu is currently the only place where we have this "desktop-preinstalled" annotation on the project name - all the other preinstalled images use the bare project name.

>  ubuntu			daily-live		bionic			amd64
>  ubuntu			daily-live		focal-jammy		amd64 arm64 amd64+intel-iot
>  ubuntu			daily-live		lunar			amd64 arm64


-- 
https://code.launchpad.net/~edubuntu-dev/ubuntu-cdimage/+git/ubuntu-cdimage/+merge/458839
Your team Edubuntu Developers is subscribed to branch ~edubuntu-dev/ubuntu-cdimage:main.