Actually fix live-build/ubuntu-cpc/hooks.d/base/disk-image.binary to not call force_boot_without_initramfs on s390x rather than disk-image-uefi.binary which obviously would never run on s390x.

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (23.10.7) UNRELEASED; urgency=medium
+
+  * Actually fix live-build/ubuntu-cpc/hooks.d/base/disk-image.binary to not
+    call force_boot_without_initramfs on s390x rather than
+    disk-image-uefi.binary which obviously would never run on s390x.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Sat, 29 Jul 2023 13:00:37 +1200
+
 livecd-rootfs (23.10.6) mantic; urgency=medium
 
   * live-build/ubuntu-cpc/hooks.d/base/disk-image-*.binary: Fix invocations of

live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary

@@ -127,7 +127,7 @@ install_grub() {
     fi
 
     # Use initrdless boot for minimal images
-    if [ "${SUBPROJECT:-}" = "minimized" ] && [ "$ARCH" != "s390x" ]; then
+    if [ "${SUBPROJECT:-}" = "minimized" ]; then
         force_boot_without_initramfs mountpoint
     fi
 

live-build/ubuntu-cpc/hooks.d/base/disk-image.binary

@@ -129,11 +129,11 @@ if [ "${should_install_grub}" -eq 1 ]; then
     undivert_grub mountpoint
 
     rm mountpoint/tmp/device.map
-fi
 
-# Use initrdless boot for minimal images
-if [ "${SUBPROJECT:-}" = "minimized" ]; then
-    force_boot_without_initramfs mountpoint
+    # Use initrdless boot for minimal images
+    if [ "${SUBPROJECT:-}" = "minimized" ]; then
+        force_boot_without_initramfs mountpoint
+    fi
 fi
 
 if [ "$ARCH" = "s390x" ]; then