From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 27 Nov 2024 18:52:27 +0000 (+0100)
Subject: Revert "Remove tools argument from finaiize_default_initrd()"
X-Git-Tag: v25~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5103ebb13061b5e903892d2b9bdffa7a1ce9b060;p=thirdparty%2Fmkosi.git

Revert "Remove tools argument from finaiize_default_initrd()"

This reverts commit 75a22e52602f18f887a0bac82eaf84e5983941c1.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 995010216..ebb815b15 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1197,6 +1197,7 @@ def finalize_default_initrd(
     config: Config,
     *,
     resources: Path,
+    tools: bool = True,
     output_dir: Optional[Path] = None,
 ) -> Config:
     if config.root_password:
@@ -1253,7 +1254,7 @@ def finalize_default_initrd(
         *(["--hostname", config.hostname] if config.hostname else []),
         *(["--root-password", rootpwopt] if rootpwopt else []),
         *([f"--environment={k}='{v}'" for k, v in config.environment.items()]),
-        *(["--tools-tree", str(config.tools_tree)] if config.tools_tree else []),
+        *(["--tools-tree", str(config.tools_tree)] if config.tools_tree and tools else []),
         "--tools-tree-certificates", str(config.tools_tree_certificates),
         *([f"--extra-search-path={p}" for p in config.extra_search_paths]),
         *(["--proxy-url", config.proxy_url] if config.proxy_url else []),
@@ -4612,7 +4613,7 @@ def run_verb(args: Args, images: Sequence[Config], *, resources: Path) -> None:
             run_clean(args, config)
 
         if last.output_format != OutputFormat.none:
-            run_clean(args, finalize_default_initrd(last, resources=resources))
+            run_clean(args, finalize_default_initrd(last, tools=False, resources=resources))
 
         rmtree(Path(".mkosi-private"))
 
@@ -4693,7 +4694,7 @@ def run_verb(args: Args, images: Sequence[Config], *, resources: Path) -> None:
             run_clean(args, config)
 
         if last.output_format != OutputFormat.none:
-            run_clean(args, finalize_default_initrd(last, resources=resources))
+            run_clean(args, finalize_default_initrd(last, tools=False, resources=resources))
 
     if tools and not (tools.output_dir_or_cwd() / tools.output).exists():
         with prepend_to_environ_path(tools):