From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 22 May 2024 12:24:12 +0000 (+0200)
Subject: sandbox: check if bwrap is installed
X-Git-Tag: v23.1~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87c900f0751ccdbde83332f0f7afcf506d05cb51;p=thirdparty%2Fmkosi.git

sandbox: check if bwrap is installed

bwrap is used for many many different things, so I just added a blanket
check that requires is to be always required if use any of the verbs that
call check_tools().

Fixes https://github.com/systemd/mkosi/issues/2719.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 08e1fb584..4bd9b6606 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2724,6 +2724,8 @@ def check_systemd_tool(
 
 
 def check_tools(config: Config, verb: Verb) -> None:
+    check_tool(config, "bwrap", reason="execute sandboxed commands")
+
     if verb == Verb.build:
         if config.bootable != ConfigFeature.disabled:
             check_tool(config, "depmod", reason="generate kernel module dependencies")