From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 17 Jul 2023 16:04:31 +0000 (+0200)
Subject: Revert "Make tools= argument for bwrap() required"
X-Git-Tag: v15~73^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16dcd04a5c707653fddb61abd0873ec71dc9d850;p=thirdparty%2Fmkosi.git

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

This reverts commit 2bd37a648bcace0ae505328a51eed78c9cb923b4.
---

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 0780f19ec..38d3c0a9a 100644
--- 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 2a50f19c9..a1e5291c6 100644
--- 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]] = {},