Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 03:11:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2023-07-29 13:02:56 +12:00
parent 41f4783f19
commit d3dfb12f85
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -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

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

@ -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

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

@ -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