diff --git a/debian/changelog b/debian/changelog index 61c9d508..62b1c0de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,10 @@ livecd-rootfs (2.801) UNRELEASED; urgency=medium * RISC-V: avoid soft lockup Radeon GPUs. With Radeon GPUs and kernel 5.19 a soft lockup was observed. Increase the watchdog threshold. - -- Łukasz 'sil2100' Zemczak Thu, 23 Feb 2023 16:28:00 +0100 + [ Łukasz 'sil2100' Zemczak ] + * Add ubuntucinnamon to the supported flavours. + + -- Łukasz 'sil2100' Zemczak Thu, 23 Feb 2023 19:31:12 +0100 livecd-rootfs (2.800) lunar; urgency=medium diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index fa345387..9d63d7a0 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -27,6 +27,7 @@ ALL_TRIPLETS=" ubuntu-budgie:: ubuntu-budgie-desktop:: ubuntu-budgie-live:: + ubuntucinnamon:: ubuntu-core:system-image:ubuntu-core ubuntu-cpc::ubuntu-cpc ubuntu-cpc:minimized:ubuntu-cpc diff --git a/live-build/auto/config b/live-build/auto/config index 35e1cb73..698648e6 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -653,7 +653,7 @@ case $PROJECT in ubuntu-server) COMPONENTS='main' ;; - kubuntu|kubuntu-dvd|kubuntu-plasma5|edubuntu|ubuntu-gnome|ubuntu-budgie|ubuntukylin) + kubuntu|kubuntu-dvd|kubuntu-plasma5|edubuntu|ubuntu-gnome|ubuntu-budgie|ubuntukylin|ubuntucinnamon) COMPONENTS='main restricted universe' ;; xubuntu|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) @@ -780,6 +780,11 @@ case $PROJECT in LIVE_TASK='edubuntu-live' ;; + ubuntucinnamon) + add_task install minimal standard ubuntucinnamon-desktop + LIVE_TASK='ubuntucinnamon-live' + ;; + xubuntu) case ${SUBPROJECT:-} in minimal)