Imported 24.04.12 from noble-release pocket.

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2023-12-15 00:00:16 +00:00
parent 20cb3bceae
commit 444aafc39b
2 changed files with 37 additions and 3 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (24.04.12) noble; urgency=medium
* Switch Edubuntu to the new installer.
* Add casper to minimal.standard.live seed.
-- Erich Eickmeyer <eeickmeyer@ubuntu.com> Tue, 12 Dec 2023 12:56:37 -0800
livecd-rootfs (24.04.11) noble; urgency=medium livecd-rootfs (24.04.11) noble; urgency=medium
* Explicitly add_package linux-$KERNEL_FLAVOURS in Ubuntu Studio. * Explicitly add_package linux-$KERNEL_FLAVOURS in Ubuntu Studio.

View File

@ -556,7 +556,7 @@ case $IMAGEFORMAT in
*) *)
case $PROJECT in case $PROJECT in
ubuntu-server|ubuntu-wsl|ubuntu-oem|ubuntu|\ ubuntu-server|ubuntu-wsl|ubuntu-oem|ubuntu|\
ubuntu-budgie|ubuntustudio-dvd) ubuntu-budgie|ubuntustudio-dvd|edubuntu)
;; ;;
*) *)
add_package live casper add_package live casper
@ -798,8 +798,35 @@ case $PROJECT in
;; ;;
edubuntu) edubuntu)
add_task install minimal standard edubuntu-desktop-gnome # Edubuntu now ships the new installer.
LIVE_TASK='edubuntu-live' 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
;; ;;
lubuntu|ubuntu-gnome|ubuntu-unity|ubuntucinnamon|ubuntukylin) lubuntu|ubuntu-gnome|ubuntu-unity|ubuntucinnamon|ubuntukylin)