Two follow ups for #3678

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 0fcb26deb7d61414efd6222a61fb392d97dadedd..dc6838e55d62bde172b44abd02f091464b76755b 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -4126,8 +4126,8 @@ def run_sandbox(args: Args, config: Config) -> None:
         env |= {"MKOSI_HOST_DISTRIBUTION": str(hd)}
     if hr:
         env |= {"MKOSI_HOST_RELEASE": hr}
-    if config.tools_tree:
-        env |= {"MKOSI_DEFAULT_TOOLS_TREE_PATH": os.fspath(config.tools_tree)}
+    if config.tools() != Path("/"):
+        env |= {"MKOSI_DEFAULT_TOOLS_TREE_PATH": os.fspath(config.tools())}
 
     cmdline = [*args.cmdline]
 

diff --git a/mkosi/config.py b/mkosi/config.py
index 90a3bd144447ac0a76259cbea18b1da9fb43772c..f7fe14bb3d18acd305eeadae6221affdea8c2c8c 100644 (file)
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -5099,7 +5099,7 @@ def parse_config(
 
     if config.get("tools_tree") == Path("default"):
         if in_sandbox():
-            config["tools_tree"] = os.environ["MKOSI_DEFAULT_TOOLS_TREE_PATH"]
+            config["tools_tree"] = Path(os.environ["MKOSI_DEFAULT_TOOLS_TREE_PATH"])
         else:
             tools = finalize_default_tools(context, config, configdir=configdir, resources=resources)
             config["tools_tree"] = tools.output_dir_or_cwd() / tools.output