Revert "Make tools= argument for bwrap() required"

This reverts commit 2bd37a648bcace0ae505328a51eed78c9cb923b4.

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 0780f19ecb5e59c2416317d73d6b5be511d8afe1..38d3c0a9a308a9247d8d2057137d858d67883423 100644 (file)
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -274,10 +274,7 @@ 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],
-                tools=config.tools_tree,
-            )
+            bwrap(["systemd-repart", "--definitions", "", "--no-pager", "--size", "8G", "--pretty", "no", fname])
 
         # 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 2a50f19c98cc3e75b945ac35c8d25310d7dc1d48..a1e5291c605a2eb8690469cf63fbb12495f81fe8 100644 (file)
--- a/mkosi/run.py
+++ b/mkosi/run.py
@@ -412,7 +412,7 @@ def bwrap_cmd(
 def bwrap(
     cmd: Sequence[PathString],
     *,
-    tools: Optional[Path],
+    tools: Optional[Path] = None,
     apivfs: Optional[Path] = None,
     log: bool = True,
     scripts: Mapping[str, Sequence[PathString]] = {},