From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 5 Sep 2024 09:55:37 +0000 (+0200)
Subject: mkosi-initrd: Ignore gnupg subdirectory
X-Git-Tag: v25~316^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F3003%2Fhead;p=thirdparty%2Fmkosi.git

mkosi-initrd: Ignore gnupg subdirectory

/etc/pacman.d/gnupg is already made available by mkosi's internal
logic so we don't need to copy it in. This prevents failures when
running unprivileged as /etc/pacman.d/gnupg can have rather strict
permissions.
---

diff --git a/mkosi/initrd.py b/mkosi/initrd.py
index c22d283cb..c3fe84887 100644
--- a/mkosi/initrd.py
+++ b/mkosi/initrd.py
@@ -130,7 +130,7 @@ def main() -> None:
                 shutil.copy2(Path("/etc") / p, Path(d) / "etc" / p)
             else:
                 shutil.copytree(Path("/etc") / p, Path(d) / "etc" / p,
-                                ignore=shutil.ignore_patterns("S.*"), dirs_exist_ok=True)
+                                ignore=shutil.ignore_patterns("gnupg"), dirs_exist_ok=True)
 
         cmdline += ["--sandbox-tree", d]