From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 30 Apr 2024 13:27:01 +0000 (+0200)
Subject: Don't look in --extra-search-paths for qemu and virt-fw-vars
X-Git-Tag: v23.1~82^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b638986c68ce17a6744347f7a573b79b685e6d21;p=thirdparty%2Fmkosi.git

Don't look in --extra-search-paths for qemu and virt-fw-vars

These take as input a file that might be in or out of the tools tree.
Because find_ovmf_firmware() will return a file in the tools tree
regardless of whether virt-fw-vars and qemu will be executed on the
host or not, let's disable the --extra-search-paths= integration for
these two for now.
---

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 8fc232c04..ce6a37bf1 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -597,7 +597,7 @@ def finalize_firmware_variables(config: Config, ovmf: OvmfConfig, stack: context
                 "--loglevel", "WARNING",
             ],
             sandbox=config.sandbox(
-                binary="virt-fw-vars",
+                binary=None,
                 mounts=[
                     Mount(ovmf_vars.name, ovmf_vars.name),
                     Mount(config.secure_boot_certificate, config.secure_boot_certificate, ro=True),
@@ -1150,7 +1150,7 @@ def run_qemu(args: Args, config: Config) -> None:
             env=os.environ | config.environment,
             log=False,
             foreground=True,
-            sandbox=config.sandbox(binary=cmdline[0], network=True, devices=True, relaxed=True),
+            sandbox=config.sandbox(binary=None, network=True, devices=True, relaxed=True),
         ) as (proc, innerpid):
             # We have to close these before we wait for qemu otherwise we'll deadlock as qemu will never exit.
             for fd in qemu_device_fds.values():