From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 28 Nov 2023 13:33:11 +0000 (+0100)
Subject: Fix user provided kernel not being used
X-Git-Tag: v20~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d9f5c2e7a0a57329af3146abb9ae2be6ddcb76f;p=thirdparty%2Fmkosi.git

Fix user provided kernel not being used
---

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 69c645379..a928cb19c 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -425,8 +425,11 @@ def run_qemu(args: MkosiArgs, config: MkosiConfig, qemu_device_fds: Mapping[Qemu
         firmware = config.qemu_firmware
 
     if (
-        firmware == QemuFirmware.linux or
-        config.output_format in (OutputFormat.cpio, OutputFormat.directory, OutputFormat.uki)
+        not kernel and
+        (
+            firmware == QemuFirmware.linux or
+            config.output_format in (OutputFormat.cpio, OutputFormat.directory, OutputFormat.uki)
+        )
     ):
         if firmware == QemuFirmware.uefi:
             name = config.output if config.output_format == OutputFormat.uki else config.output_split_uki