]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
mkosi-initrd: refactor add_raid_config -> raid_config 3646/head
authorAntonio Alvarez Feijoo <antonio.feijoo@suse.com>
Thu, 3 Apr 2025 05:55:46 +0000 (07:55 +0200)
committerAntonio Alvarez Feijoo <antonio.feijoo@suse.com>
Thu, 3 Apr 2025 05:55:46 +0000 (07:55 +0200)
mkosi/initrd.py

index 2ec3717464993cccb2f90f8504edaa347a285ead..45f3ff5211e2efb96a4524a41f61d848df182cf9 100644 (file)
@@ -181,14 +181,12 @@ def process_crypttab(staging_dir: Path) -> list[str]:
     return cmdline
 
 
-def add_raid_config() -> list[str]:
-    cmdline = []
-
-    for f in ("/etc/mdadm.conf", "/etc/mdadm.conf.d", "/etc/mdadm/mdadm.conf", "/etc/mdadm/mdadm.conf.d"):
-        if Path(f).exists():
-            cmdline += ["--extra-tree", f"{f}:{f}"]
-
-    return cmdline
+def raid_config() -> list[str]:
+    return [
+        f"--extra-tree={f}:{f}"
+        for f in ("/etc/mdadm.conf", "/etc/mdadm.conf.d", "/etc/mdadm/mdadm.conf", "/etc/mdadm/mdadm.conf.d")
+        if Path(f).exists()
+    ]
 
 
 def vconsole_config() -> list[str]:
@@ -315,7 +313,7 @@ def main() -> None:
         for p in args.profile:
             cmdline += ["--profile", p]
             if p == "raid":
-                cmdline += add_raid_config()
+                cmdline += raid_config()
 
         if args.kernel_image:
             cmdline += [