From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 26 Nov 2024 14:52:32 +0000 (+0100)
Subject: Remove tools argument from finaiize_default_initrd()
X-Git-Tag: v25~142^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3233%2Fhead;p=thirdparty%2Fmkosi.git

Remove tools argument from finaiize_default_initrd()

Not required anymore since the tools tree isn't part of the cache
manifest anymore.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 705ab6974..f347a11e9 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1197,7 +1197,6 @@ def finalize_default_initrd(
     config: Config,
     *,
     resources: Path,
-    tools: bool = True,
     output_dir: Optional[Path] = None,
 ) -> Config:
     if config.root_password:
@@ -1254,7 +1253,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 and tools else []),
+        *(["--tools-tree", str(config.tools_tree)] if config.tools_tree 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 []),
@@ -4606,7 +4605,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, tools=False, resources=resources))
+            run_clean(args, finalize_default_initrd(last, resources=resources))
 
         rmtree(Path(".mkosi-private"))
 
@@ -4687,7 +4686,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, tools=False, resources=resources))
+            run_clean(args, finalize_default_initrd(last, resources=resources))
 
     if tools and not (tools.output_dir_or_cwd() / tools.output).exists():
         with prepend_to_environ_path(tools):