From 810458d2a4b5fb188a8767e51a9d19056b9aad1b Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Mon, 12 Feb 2024 08:55:38 +1300 Subject: [PATCH] Edubuntu, Ubuntu Studio and Ubuntu Budgie have hooks in live-build/${PROJECT}/hooks now but they need to be copied to config/ to do anything. --- debian/changelog | 8 ++++++++ live-build/auto/config | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8c9dfd1d..446235c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (24.04.33) UNRELEASED; urgency=medium + + * Edubuntu, Ubuntu Studio and Ubuntu Budgie have hooks in + live-build/${PROJECT}/hooks now but they need to be copied to config/ to + do anything. + + -- Michael Hudson-Doyle Mon, 12 Feb 2024 08:54:35 +1300 + livecd-rootfs (24.04.28) noble; urgency=medium * Add missing mkdir invocation from 24.04.26 (LP: #2052617). diff --git a/live-build/auto/config b/live-build/auto/config index 4fe67dcd..7b7ae13f 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1426,9 +1426,12 @@ deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-proposed universe multiverse EOF fi ;; +esac +case $PROJECT:${SUBPROJECT:-} in 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:*) # 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