From e63f9b8906733de6602044807c903cf8c358520d Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 29 Nov 2024 12:42:33 -0500 Subject: [PATCH] packages-openshift: add compat tmpfiles.d dropin We can't rely on rpm-ostree's var-to-tmpfiles.d conversion anymore for layered packages. Let's not worry about it for new packages in the future, but at least for the existing ones, let's add a compat dropin that adds back what we lost. Though I could also imagine exposing a e.g. `rpm-ostree generate-tmpfiles.d` that we could use here, or just lift that code into a separate utility/SDK since it's globally useful. --- packages-openshift.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages-openshift.yaml b/packages-openshift.yaml index 308850c3..83874e86 100644 --- a/packages-openshift.yaml +++ b/packages-openshift.yaml @@ -142,4 +142,16 @@ postprocess: rm -f /etc/selinux/targeted/*.LOCK # cache, logs, etc... rm -rf /var && mkdir /var + # All the entries here should instead be part of their respective + # packages. But we carry them here for now to maintain compatibility. + cat > /usr/lib/tmpfiles.d/openshift.conf << EOF + L /opt/cni - - - - ../../usr/lib/opt/cni + d /var/lib/cni 0755 root root - - + d /var/lib/cni/bin 0755 root root - - + d /var/lib/containers 0755 root root - - + d /var/lib/openvswitch 0755 root root - - + d /var/lib/openvswitch/pki 0755 root root - - + d /var/log/openvswitch 0750 openvswitch hugetlbfs - - + d /var/lib/unbound 0755 unbound unbound - - + EOF fi