From 37341541b4be9226e048c7c686e9be199374e2ae Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Sat, 29 Jul 2023 07:34:35 +1200 Subject: [PATCH] live-build/ubuntu-cpc/hooks.d/base/disk-image.binary: Do not call force_boot_without_initramfs on s390x. --- debian/changelog | 2 ++ live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4a20e489..aa157f09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ livecd-rootfs (23.10.6) UNRELEASED; urgency=medium force_boot_without_initramfs to pass "mountpoint" and not "${mountpoint}" (which actually worked on most arches for VERY BAD reasons but fails on s390x). + * live-build/ubuntu-cpc/hooks.d/base/disk-image.binary: Do not call + force_boot_without_initramfs on s390x. -- Michael Hudson-Doyle Fri, 28 Jul 2023 14:40:13 +1200 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 020dd33f..3c5a488d 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 @@ -127,7 +127,7 @@ install_grub() { fi # Use initrdless boot for minimal images - if [ "${SUBPROJECT:-}" = "minimized" ]; then + if [ "${SUBPROJECT:-}" = "minimized" ] && [ "$ARCH" != "s390x" ]; then force_boot_without_initramfs mountpoint fi