From 55c7d5720da685c484ffafa3c196a92bc0e45895 Mon Sep 17 00:00:00 2001 From: Erich Eickmeyer Date: Sun, 12 Feb 2023 10:03:13 -0800 Subject: [PATCH] Bring back Edubuntu --- debian/tests/default-bootstraps | 1 + live-build/auto/config | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 9e1fc5f6..7a827d9f 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -13,6 +13,7 @@ fi # Listed subprojects can be combined with other projects as well, # but this list gives reasonable coverage. ALL_TRIPLETS=" + edubuntu:: kubuntu:: kubuntu-dvd:: kubuntu-plasma5:: diff --git a/live-build/auto/config b/live-build/auto/config index 1722e98b..3570c9a7 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|ubuntu-gnome|ubuntu-budgie|ubuntukylin) + kubuntu|kubuntu-dvd|kubuntu-plasma5|edubuntu|ubuntu-gnome|ubuntu-budgie|ubuntukylin) COMPONENTS='main restricted universe' ;; xubuntu|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) @@ -775,6 +775,11 @@ case $PROJECT in add_chroot_hook remove-gnome-icon-cache ;; + edubuntu) + add_task install minimal standard ubuntu-minimal edubuntu-desktop-gnome + LIVE_TASK='edubuntu-live' + ;; + xubuntu) add_task install minimal standard xubuntu-desktop add_package install xterm