|
|
|
|
@ -569,7 +569,7 @@ case $IMAGEFORMAT in
|
|
|
|
|
*)
|
|
|
|
|
case $PROJECT in
|
|
|
|
|
ubuntu-server|ubuntu-wsl|ubuntu-oem|ubuntu|\
|
|
|
|
|
ubuntu-budgie|ubuntustudio-dvd|edubuntu)
|
|
|
|
|
ubuntu-budgie|ubuntustudio-dvd|edubuntu|ubuntucinnamon)
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
add_package live casper
|
|
|
|
|
@ -842,7 +842,39 @@ case $PROJECT in
|
|
|
|
|
https://git.launchpad.net/subiquity po config/catalog-translations
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
lubuntu|ubuntu-gnome|ubuntu-unity|ubuntucinnamon|ubuntukylin)
|
|
|
|
|
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|ubuntukylin)
|
|
|
|
|
add_task install minimal standard ${PROJECT}-desktop
|
|
|
|
|
LIVE_TASK=${PROJECT}-live
|
|
|
|
|
;;
|
|
|
|
|
@ -1431,7 +1463,7 @@ esac
|
|
|
|
|
case $PROJECT:${SUBPROJECT:-} in
|
|
|
|
|
ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \
|
|
|
|
|
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
|
|
|
|
|
for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
|
|
|
|
|
case $entry in
|
|
|
|
|
|
Michael Hudson-Doyle
10 months ago