From 795036707038ac042452f1253f6fbec52654be34 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Oct 30 2025 15:27:37 +0000
Subject: common: Workaround for dynamic UID/GID issue


See: https://gitlab.com/fedora/ostree/sig/-/issues/90

---

diff --git a/common.yaml b/common.yaml
index d9543ea..ccd2f54 100644
--- a/common.yaml
+++ b/common.yaml
@@ -34,6 +34,8 @@ include:
   - kernel-install.yaml
   # Enable composefs
   - composefs.yaml
+  # Selected ownership fixes for files in /etc & /var owned by a dynamic UID/GID
+  - dynamic-ugid-ownership-fixes.yaml
 
 arch-include:
   x86_64:
diff --git a/dynamic-ugid-ownership-fixes.yaml b/dynamic-ugid-ownership-fixes.yaml
new file mode 100644
index 0000000..cfd9343
--- /dev/null
+++ b/dynamic-ugid-ownership-fixes.yaml
@@ -0,0 +1,13 @@
+# Selected ownership fixes for files in /etc & /var owned by a dynamic UID/GID
+# See: https://gitlab.com/fedora/ostree/sig/-/issues/90
+
+postprocess:
+  - |
+    #!/bin/bash
+    set -xeuo pipefail
+
+    cat > /usr/lib/tmpfiles.d/90-atomic-desktops-ownership-fixes.conf << 'EOF'
+    Z /var/lib/passim - passim passim
+    Z /var/log/passim - passim passim
+    Z /etc/colord/    - colord colord
+    EOF