From d3dfb12f8599ef86f4c3036088f5444c64f59ac2 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Sat, 29 Jul 2023 13:02:56 +1200 Subject: [PATCH] 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 | 8 ++++++++ live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 +- live-build/ubuntu-cpc/hooks.d/base/disk-image.binary | 8 ++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 61b71b0f..6a3d2184 100644 --- a/debian/changelog +++ b/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 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 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 3c5a488d..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 @@ -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 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 253f4c69..7fcc8167 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary +++ b/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