From c42f2ef3b180dd2ace8cf0ebdb539ded94b4464b Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 28 Jul 2023 14:55:25 +1200 Subject: [PATCH] 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 | 9 +++++++++ .../hooks.d/base/disk-image-uefi-non-cloud.binary | 2 +- .../ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 +- live-build/ubuntu-cpc/hooks.d/base/disk-image.binary | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index dee62f11..4a20e489 100644 --- a/debian/changelog +++ b/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 Fri, 28 Jul 2023 14:40:13 +1200 + livecd-rootfs (23.10.5) mantic; urgency=medium [ Utkarsh Gupta ] diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary index e372443b..bcc04e28 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary +++ b/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 diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index b1acc14b..020dd33f 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/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 diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary index 68b1888a..253f4c69 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary +++ b/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