Insist on UKI when booting in UEFI firmware mode

When UEFI is requested, let's insist on booting a UKI instead of a
regular kernel image.

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index d7f03403a0978d2d7a72f5b947021d53cf9aef56..1d04684b79f36fcccea608ed61747d1105e77867 100644 (file)
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -414,10 +414,13 @@ def run_qemu(args: MkosiArgs, config: MkosiConfig, uid: int, gid: int) -> None:
             elif config.qemu_kernel:
                 kernel = config.qemu_kernel
             elif "-kernel" not in args.cmdline:
-                kernel = config.output_dir / config.output_split_kernel
+                if firmware == QemuFirmware.uefi:
+                    kernel = config.output_dir / config.output_split_uki
+                else:
+                    kernel = config.output_dir / config.output_split_kernel
                 if not kernel.exists():
                     die(
-                        "No kernel found, please install a kernel in the image "
+                        f"Kernel or UKI not found at {kernel}, please install a kernel in the image "
                         "or provide a -kernel argument to mkosi qemu"
                     )
             else: