From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Fri, 4 Oct 2024 10:14:40 +0000 (+0200)
Subject: mkosi-initrd: only set restrictive umask to create output dir if user is root
X-Git-Tag: v25~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0803830646a14333ea4e2cd3fa4ebfbd64112e55;p=thirdparty%2Fmkosi.git

mkosi-initrd: only set restrictive umask to create output dir if user is root
---

diff --git a/mkosi/initrd.py b/mkosi/initrd.py
index cb712fd41..80c21ed38 100644
--- a/mkosi/initrd.py
+++ b/mkosi/initrd.py
@@ -1,12 +1,14 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 import argparse
+import contextlib
 import os
 import platform
 import shutil
 import sys
 import tempfile
 from pathlib import Path
+from typing import cast
 
 import mkosi.resources
 from mkosi.config import DocFormat, OutputFormat
@@ -177,7 +179,7 @@ def main() -> None:
         )
 
         if args.output_dir:
-            with umask(~0o700):
+            with umask(~0o700) if os.getuid() == 0 else cast(umask, contextlib.nullcontext()):
                 Path(args.output_dir).mkdir(parents=True, exist_ok=True)
         else:
             args.output_dir = Path.cwd()