Make tools= argument for bwrap() required

We generally always want this to be used, so let's make it required.
Also, add tools= to the one invocation of bwrap() that wasn't
forwarding it yet.

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index e449fd68e0035d27b563ac01bbadfba8f8c060dd..b3900b2c4dcf1e08c2c3be351ac5ff4a7bfed2ce 100644 (file)
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -274,7 +274,10 @@ def run_qemu(args: MkosiArgs, config: MkosiConfig) -> None:
             fname = config.output_dir / config.output
 
         if config.output_format == OutputFormat.disk:
-            bwrap(["systemd-repart", "--definitions", "", "--no-pager", "--size", "8G", "--pretty", "no", fname])
+            bwrap(
+                ["systemd-repart", "--definitions", "", "--no-pager", "--size", "8G", "--pretty", "no", fname],
+                tools=config.tools_tree,
+            )
 
         # Debian images fail to boot with virtio-scsi, see: https://github.com/systemd/mkosi/issues/725
         if config.output_format == OutputFormat.cpio:

diff --git a/mkosi/run.py b/mkosi/run.py
index 9f9cdbf6333b5f0c3786b3e9b24717793959610c..0287450beaec3ab94e8b05d760427250008d1808 100644 (file)
--- a/mkosi/run.py
+++ b/mkosi/run.py
@@ -413,7 +413,7 @@ def bwrap_cmd(
 def bwrap(
     cmd: Sequence[PathString],
     *,
-    tools: Optional[Path] = None,
+    tools: Optional[Path],
     apivfs: Optional[Path] = None,
     log: bool = True,
     scripts: Mapping[str, Sequence[PathString]] = {},