From c18d3f75ad5d5af4fd4189561fa1c9ef5411ed25 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 14 Jul 2023 13:16:05 +0100 Subject: [PATCH] Fixup up two more places with kvm removal. Signed-off-by: Dimitri John Ledkov --- .../hooks.d/base/disk-image-uefi-non-cloud.binary | 7 +++---- live-build/ubuntu-cpc/hooks.d/base/series/base | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) 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 b3edaff6..e372443b 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 @@ -406,10 +406,9 @@ EOF chroot mountpoint grub-install --target=i386-pc "${loop_device}" fi - # Use the linux-kvm kernel for minimal images where available - # linux-kvm currently only exists for amd64 - if [ "${SUBPROJECT:-}" = "minimized" ] && [ "$ARCH" = "amd64" ]; then - replace_kernel mountpoint linux-kvm + # Use initrdless boot for minimal images + if [ "${SUBPROJECT:-}" = "minimized" ]; then + 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/series/base b/live-build/ubuntu-cpc/hooks.d/base/series/base index 55333887..f04bdec7 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/base +++ b/live-build/ubuntu-cpc/hooks.d/base/series/base @@ -2,7 +2,6 @@ depends root-dir depends tarball depends squashfs depends disk-image -depends kvm depends qcow2 depends vmdk depends vagrant