From 3fe62ba52099e38920dc07cf3d3a90d048dfa954 Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Fri, 20 Sep 2024 16:12:24 +0200 Subject: [PATCH] mkosi-initrd: set output mode 600 by default Traditionally, initrds stored in /boot must have their access mode set to 600. Nowadays, this is useless for initrds stored on the vfat-formatted ESP, but it doesn't hurt to support the old use case. --- mkosi/initrd.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mkosi/initrd.py b/mkosi/initrd.py index fd368139e..3b6a9d95f 100644 --- a/mkosi/initrd.py +++ b/mkosi/initrd.py @@ -88,7 +88,7 @@ def main() -> None: "mkosi", "--force", "--directory", "", - "--format", str(args.format), + "--format", args.format, "--output", args.output, "--output-dir", args.output_dir, "--extra-tree", f"/usr/lib/modules/{args.kernel_version}:/usr/lib/modules/{args.kernel_version}", @@ -111,6 +111,8 @@ def main() -> None: "--package-cache-dir=/var", "--cache-only=metadata", ] + if args.format != OutputFormat.directory.value: + cmdline += ["--output-mode=600"] for d in ("/usr/lib/mkosi-initrd", "/usr/local/lib/mkosi-initrd", "/run/mkosi-initrd", "/etc/mkosi-initrd"): if Path(d).exists(): -- 2.47.2