Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-07-27 16:51:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ubuntucinnamon-dev/ubuntu/master' into ubuntu/master

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2024-02-16 10:15:56 +13:00
commit f8bdf50724
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
live-build/auto/config
View File

@ -569,7 +569,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|edubuntu) ubuntu-budgie|ubuntustudio-dvd|edubuntu|ubuntucinnamon)
;; ;;
*) *)
add_package live casper add_package live casper
@ -841,8 +841,40 @@ case $PROJECT in
/usr/share/livecd-rootfs/checkout-translations-branch \ /usr/share/livecd-rootfs/checkout-translations-branch \
https://git.launchpad.net/subiquity po config/catalog-translations https://git.launchpad.net/subiquity po config/catalog-translations
;; ;;
ubuntucinnamon)
# Ubuntu Cinnamon now ships the new installer.
touch config/universe-enabled
PASSES_TO_LAYERS="true"
KERNEL_FLAVOURS=generic
add_task minimal minimal standard ubuntucinnamon-desktop-minimal
add_task minimal.standard ubuntucinnamon-desktop
add_task minimal.standard.live ubuntucinnamon-live
add_package minimal.standard.live linux-$KERNEL_FLAVOURS
cat <<-EOF > config/minimal.catalog-in.yaml
name: "Ubuntu Cinnamon Desktop (minimized)"
description: >-
A minimal installation of the Ubuntu Cinnamon Desktop.
id: ubuntucinnamon-desktop-minimal
type: fsimage-layered
variant: desktop
locale_support: langpack
EOF
cat <<-EOF > config/minimal.standard.catalog-in.yaml
name: "Ubuntu Cinnamon Desktop"
description: >-
A full featured Ubuntu Cinnamon Desktop.
id: ubuntucinnamon-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|ubuntukylin)
add_task install minimal standard ${PROJECT}-desktop add_task install minimal standard ${PROJECT}-desktop
LIVE_TASK=${PROJECT}-live LIVE_TASK=${PROJECT}-live
;; ;;
@ -1431,7 +1463,7 @@ esac
case $PROJECT:${SUBPROJECT:-} in case $PROJECT:${SUBPROJECT:-} in
ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \ ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \
ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:|ubuntu-oem:*| \ ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:|ubuntu-oem:*| \
ubuntustudio-dvd:*|edubuntu:*|ubuntu-budgie:*) ubuntustudio-dvd:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*)
# Ensure that most things e.g. includes.chroot are copied as is # Ensure that most things e.g. includes.chroot are copied as is
for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
case $entry in case $entry in

1
live-build/ubuntucinnamon/hooks/020-ubuntu-live.chroot_early Symbolic link
View File

@ -0,0 +1 @@
../../ubuntu/hooks/020-ubuntu-live.chroot_early