From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 21 Sep 2023 09:25:12 +0000 (+0200)
Subject: Insist on UKI when booting in UEFI firmware mode
X-Git-Tag: v18~48^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b412d416bbd684d02850bc7de3009e317adb7f34;p=thirdparty%2Fmkosi.git

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 d7f03403a..1d04684b7 100644
--- 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: