Fixup up two more places with kvm removal.

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>

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

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