From eb55216f7d32d3530b225f7600cffff158e2fc06 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 12 Feb 2025 18:45:43 -0500
Subject: [PATCH] provision: Fast track some tmpfiles.d additions

I put these in https://gitlab.com/fedora/bootc/base-images/-/merge_requests/92
too but let's fast track them to our images here so
we unblock testing tmpfiles.d translation.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 hack/provision-derived.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/hack/provision-derived.sh b/hack/provision-derived.sh
index 26625479..7ca4a80a 100755
--- a/hack/provision-derived.sh
+++ b/hack/provision-derived.sh
@@ -19,3 +19,21 @@ dnf clean all
 rm /var/log/* /var/cache /var/lib/{dnf,rpm-state,rhsm} -rf
 # And clean root's homedir
 rm /var/roothome/.config -rf
+
+# Fast track tmpfiles.d content from the base image, xref
+# https://gitlab.com/fedora/bootc/base-images/-/merge_requests/92
+if test '!' -f /usr/lib/tmpfiles.d/bootc-base-rpmstate.conf; then
+  cat >/usr/lib/tmpfiles.d/bootc-base-rpmstate.conf <<'EOF'
+# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=771713
+d /var/lib/rpm-state 0755 - - -
+EOF
+fi
+if ! grep -q -r var/roothome/buildinfo /usr/lib/tmpfiles.d; then
+  cat > /usr/lib/tmpfiles.d/bootc-contentsets.conf <<'EOF'
+# Workaround for https://github.com/konflux-ci/build-tasks-dockerfiles/pull/243
+d /var/roothome/buildinfo 0755 - - -
+d /var/roothome/buildinfo/content_manifests 0755 - - -
+# Note we don't actually try to recreate the content; this just makes the linter ignore it
+f /var/roothome/buildinfo/content_manifests/content-sets.json 0644 - - -
+EOF
+fi