Skip to content

Commit eb55216

Browse files
committed
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 <[email protected]>
1 parent 9363b23 commit eb55216

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

hack/provision-derived.sh

+18
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,21 @@ dnf clean all
1919
rm /var/log/* /var/cache /var/lib/{dnf,rpm-state,rhsm} -rf
2020
# And clean root's homedir
2121
rm /var/roothome/.config -rf
22+
23+
# Fast track tmpfiles.d content from the base image, xref
24+
# https://gitlab.com/fedora/bootc/base-images/-/merge_requests/92
25+
if test '!' -f /usr/lib/tmpfiles.d/bootc-base-rpmstate.conf; then
26+
cat >/usr/lib/tmpfiles.d/bootc-base-rpmstate.conf <<'EOF'
27+
# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=771713
28+
d /var/lib/rpm-state 0755 - - -
29+
EOF
30+
fi
31+
if ! grep -q -r var/roothome/buildinfo /usr/lib/tmpfiles.d; then
32+
cat > /usr/lib/tmpfiles.d/bootc-contentsets.conf <<'EOF'
33+
# Workaround for https://github.com/konflux-ci/build-tasks-dockerfiles/pull/243
34+
d /var/roothome/buildinfo 0755 - - -
35+
d /var/roothome/buildinfo/content_manifests 0755 - - -
36+
# Note we don't actually try to recreate the content; this just makes the linter ignore it
37+
f /var/roothome/buildinfo/content_manifests/content-sets.json 0644 - - -
38+
EOF
39+
fi

0 commit comments

Comments
 (0)