From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 23 Jan 2025 08:12:14 +0000 (+0100)
Subject: Simplify crypto-policies copying
X-Git-Tag: v25~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9fa67c0fce858a7e29421c45031bf705ed9eb46;p=thirdparty%2Fmkosi.git

Simplify crypto-policies copying

To make matters even more interesting, aside from a bunch of .txt
files in /usr/share/crypto-policies/DEFAULT, there's also the same
files in /usr/share/crypto-policies/back-ends/DEFAULT, but they do
have the .config extension there, so lets simplify the logic by
copying from that location.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 181aed6ad..7cd65cbff 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1085,16 +1085,10 @@ def install_sandbox_trees(config: Config, dst: Path) -> None:
     # Ensure /etc exists in the sandbox
     (dst / "etc").mkdir(exist_ok=True)
 
-    if (p := config.tools() / "usr/share/crypto-policies/DEFAULT").exists():
+    if (p := config.tools() / "usr/share/crypto-policies/back-ends/DEFAULT").exists():
         Path(dst / "etc/crypto-policies").mkdir(exist_ok=True)
         copy_tree(p, dst / "etc/crypto-policies/back-ends", sandbox=config.sandbox)
 
-        # The files in /usr/share/crypto-policies have the .txt extension but in /etc/crypto-policies it
-        # should have the .config extension so rename all the files after copying them.
-        for p in (dst / "etc/crypto-policies/back-ends").iterdir():
-            if p.suffix == ".txt":
-                p.rename(p.with_suffix(".config"))
-
     if config.sandbox_trees:
         with complete_step("Copying in sandbox trees…"):
             for tree in config.sandbox_trees: