]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Fix user provided kernel not being used
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 28 Nov 2023 13:33:11 +0000 (14:33 +0100)
committerJörg Behrmann <behrmann@physik.fu-berlin.de>
Tue, 28 Nov 2023 16:43:20 +0000 (17:43 +0100)
mkosi/qemu.py

index 69c64537999f45c92d46b4f14cb60076432b6fac..a928cb19caba36b8a67a42a89d6d01c4b0d69ff3 100644 (file)
@@ -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