From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 26 Nov 2024 14:44:21 +0000 (+0100)
Subject: Remove --force from default initrd command line
X-Git-Tag: v25~142^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61e6e230ed39b43db8762d7e4dd711ff84ffa259;p=thirdparty%2Fmkosi.git

Remove --force from default initrd command line

We don't use the resulting Args instance so no point in passing
--force.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 0b8f644af..6245f10d7 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1194,7 +1194,6 @@ def want_initrd(context: Context) -> bool:
 
 
 def finalize_default_initrd(
-    args: Args,
     config: Config,
     *,
     resources: Path,
@@ -1264,7 +1263,6 @@ def finalize_default_initrd(
         *(["--proxy-client-certificate", str(p)] if (p := config.proxy_client_certificate) else []),
         *(["--proxy-client-key", str(p)] if (p := config.proxy_client_key) else []),
         "--selinux-relabel", str(relabel),
-        *(["-f"] * args.force),
         "--include=mkosi-initrd",
     ]  # fmt: skip
 
@@ -1280,7 +1278,6 @@ def build_default_initrd(context: Context) -> Path:
         die("Building a default initrd is not supported for custom distributions")
 
     config = finalize_default_initrd(
-        context.args,
         context.config,
         resources=context.resources,
         output_dir=context.workspace,
@@ -1402,7 +1399,7 @@ def build_microcode_initrd(context: Context) -> list[Path]:
 def finalize_kernel_modules_include(context: Context, *, include: Sequence[str], host: bool) -> set[str]:
     final = {i for i in include if i not in ("default", "host")}
     if "default" in include:
-        initrd = finalize_default_initrd(context.args, context.config, resources=context.resources)
+        initrd = finalize_default_initrd(context.config, resources=context.resources)
         final.update(initrd.kernel_modules_include)
     if host or "host" in include:
         final.update(loaded_modules())
@@ -4351,7 +4348,7 @@ def run_clean(args: Args, config: Config, *, resources: Path) -> None:
         metadata = [metadata_cache(config)] if not config.image else []
 
         initrd = (
-            cache_tree_paths(finalize_default_initrd(args, config, tools=False, resources=resources))
+            cache_tree_paths(finalize_default_initrd(config, tools=False, resources=resources))
             if config.distribution != Distribution.custom
             else []
         )