From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 20 Apr 2023 08:30:00 +0000 (+0200)
Subject: When invoking qemu, put all -drive args adjacent
X-Git-Tag: v15~226^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbcb9f6c5c6ad3b5a15882c9ce5e975e45cf64d3;p=thirdparty%2Fmkosi.git

When invoking qemu, put all -drive args adjacent

The -smbios args are very long. I was checking out secureboot config,
and I thought that the second -drive argument is missing. Let's make
them adjacent again.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 1b45f2186..12db7bfbe 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2179,12 +2179,12 @@ def run_qemu(config: MkosiConfig) -> None:
             "-serial", "chardev:console",
         ]
 
-    cmdline += ["-drive", f"if=pflash,format=raw,readonly=on,file={firmware}"]
-
     for k, v in config.credentials.items():
         cmdline += ["-smbios", f"type=11,value=io.systemd.credential.binary:{k}={base64.b64encode(v.encode()).decode()}"]
     cmdline += ["-smbios", f"type=11,value=io.systemd.stub.kernel-cmdline-extra={' '.join(config.kernel_command_line_extra)}"]
 
+    cmdline += ["-drive", f"if=pflash,format=raw,readonly=on,file={firmware}"]
+
     with contextlib.ExitStack() as stack:
         if fw_supports_sb:
             ovmf_vars = stack.enter_context(tempfile.NamedTemporaryFile(prefix=".mkosi-", dir=tmp_dir()))