From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 1 Sep 2023 12:42:51 +0000 (+0200)
Subject: Prefer kernel specified via -kernel over kernel installed in the image
X-Git-Tag: v16~22^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3836242712e8113ef9fd80a61fc01d64b22c662;p=thirdparty%2Fmkosi.git

Prefer kernel specified via -kernel over kernel installed in the image
---

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 02f8dcc18..52fcf6cf3 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -305,12 +305,14 @@ def run_qemu(args: MkosiArgs, config: MkosiConfig) -> None:
                  fname])
 
         if config.qemu_firmware == QemuFirmware.direct or config.output_format == OutputFormat.cpio:
-            kernel = config.output_dir / config.output_split_kernel
-            if not kernel.exists() and "-kernel" not in args.cmdline:
-                die("No kernel found, please install a kernel in the image or provide a -kernel argument to mkosi qemu")
+            if "-kernel" not in args.cmdline:
+                kernel = config.output_dir / config.output_split_kernel
+                if not kernel.exists():
+                    die("No kernel found, please install a kernel in the image or provide a -kernel argument to mkosi qemu")
 
-            cmdline += ["-kernel", kernel,
-                        "-append", " ".join(config.kernel_command_line + config.kernel_command_line_extra)]
+                cmdline += ["-kernel", kernel]
+
+            cmdline += ["-append", " ".join(config.kernel_command_line + config.kernel_command_line_extra)]
 
         if config.output_format == OutputFormat.cpio:
             cmdline += ["-initrd", fname]