Fix recent build failures by changing kernel/initrd naming and adjust hook conditionals for the minimal layer re-addition.

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (23.10.36) UNRELEASED; urgency=medium
+
+  * Since we restored the minimal layer, we also need to adjust all hook
+    conditionals to use the minimal.standard layer name instead of standard.
+  * 020-ubuntu-live.binary hook: make sure the kernel and initrd artifacts are
+    named correctly.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 13 Sep 2023 11:43:22 +0200
+
 livecd-rootfs (23.10.35) mantic; urgency=medium
 
   * Restore a desktop minimal layer and use if by default (ffe lp: #2034261)

live-build/ubuntu/hooks/020-foreign-arch.chroot_early

@@ -3,7 +3,7 @@
 set -eu
 
 case ${PASS:-} in
-    standard)
+    minimal.standard)
         ;;
     *)
         exit 0

live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary

@@ -3,7 +3,7 @@
 set -eux
 
 case ${PASS:-} in
-    standard.enhanced-secureboot)
+    minimal.standard.enhanced-secureboot)
         ;;
     *)
         exit 0

live-build/ubuntu/hooks/020-ubuntu-live.binary

@@ -7,7 +7,7 @@
 set -eux
 
 case ${PASS:-} in
-    standard.live)
+    minimal.standard.live)
         ;;
     *)
         exit 0
@@ -21,6 +21,6 @@ fi
 . config/binary
 . config/functions
 
-mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-generic-hwe
-mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-generic-hwe
-chmod a+r ${PWD}/livecd.${PROJECT}.initrd-generic-hwe ${PWD}/livecd.${PROJECT}.kernel-generic-hwe
+mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-generic
+mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-generic
+chmod a+r ${PWD}/livecd.${PROJECT}.initrd-generic ${PWD}/livecd.${PROJECT}.kernel-generic

live-build/ubuntu/hooks/020-ubuntu-live.chroot_early

@@ -3,7 +3,7 @@
 set -eu
 
 case ${PASS:-} in
-    standard.live)
+    minimal.standard.live)
         ;;
     *)
         exit 0