From 68970e1e0eb0ff4179049971c3f308726322acdf Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Thu, 3 Apr 2025 07:55:46 +0200 Subject: [PATCH] mkosi-initrd: refactor add_raid_config -> raid_config --- mkosi/initrd.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/mkosi/initrd.py b/mkosi/initrd.py index 2ec371746..45f3ff521 100644 --- a/mkosi/initrd.py +++ b/mkosi/initrd.py @@ -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 += [ -- 2.47.2