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

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 e449fd68e..b3900b2c4 100644
--- 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 9f9cdbf63..0287450be 100644
--- 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]] = {},