From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Fri, 20 Sep 2024 14:12:24 +0000 (+0200)
Subject: mkosi-initrd: set output mode 600 by default
X-Git-Tag: v25~277^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F3053%2Fhead;p=thirdparty%2Fmkosi.git

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.
---

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():