live-build/ubuntu-cpc/hooks.d/base/disk-image-*.binary: Fix invocations of force_boot_without_initramfs to pass "mountpoint" and not "${mountpoint}" (which actually worked on most arches for VERY BAD reasons but fails on s390x).

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (23.10.6) UNRELEASED; urgency=medium
+
+  * live-build/ubuntu-cpc/hooks.d/base/disk-image-*.binary: Fix invocations of
+    force_boot_without_initramfs to pass "mountpoint" and not "${mountpoint}"
+    (which actually worked on most arches for VERY BAD reasons but fails on
+    s390x).
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Fri, 28 Jul 2023 14:40:13 +1200
+
 livecd-rootfs (23.10.5) mantic; urgency=medium
 
   [ Utkarsh Gupta ]

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

@@ -408,7 +408,7 @@ EOF
 
     # Use initrdless boot for minimal images
     if [ "${SUBPROJECT:-}" = "minimized" ]; then
-        force_boot_without_initramfs ${mountpoint}
+        force_boot_without_initramfs mountpoint
     fi
 
     # This call to rewrite the debian package manifest is added here to capture

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

@@ -128,7 +128,7 @@ install_grub() {
 
     # Use initrdless boot for minimal images
     if [ "${SUBPROJECT:-}" = "minimized" ]; then
-        force_boot_without_initramfs ${mountpoint}
+        force_boot_without_initramfs mountpoint
     fi
 
     # This call to rewrite the debian package manifest is added here to capture

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

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