Ignore crypto mount if it only contains empty directories

Let's beef up the crypto mount check and check if there are only
empty directories in the mount and ignore it if that's the case.
This handles the case where e.g. on Arch installing pesign leads
to /etc/pki containing only /etc/pki/pesign as an empty directory.

diff --git a/mkosi/mounts.py b/mkosi/mounts.py
index 966f0aa2f256eb5e9dcb6a54496c4c2c96c95a18..e86c4463ddd0551c1893fc74c0069f6f24614b73 100644 (file)
--- a/mkosi/mounts.py
+++ b/mkosi/mounts.py
@@ -97,7 +97,7 @@ def finalize_crypto_mounts(config: Config) -> list[PathString]:
             Path("etc/ca-certificates"),
             Path("var/lib/ca-certificates"),
         )
-        if (root / subdir).exists()
+        if (root / subdir).exists() and any(p for p in (root / subdir).rglob("*") if not p.is_dir())
     ]
 
     # This contains the Arch Linux keyring, which isn't certificates so ToolsTreeCertificates= doesn't apply.