Merge branch 'copy-hooks-more' into ubuntu/master

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 <michael.hudson@ubuntu.com>  Mon, 12 Feb 2024 08:54:35 +1300
+
 livecd-rootfs (24.04.32) noble; urgency=medium
 
   * Switch from sources.list to ubuntu.sources (LP: #2048129)

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