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 8fc232c04b23c6d931548966138737b5163f67c4..ce6a37bf18c0421d76226831c14007b8228138a2 100644 (file)
--- 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():