Merge pull request #440 from mvo5/fix-roothome

basic-fixes: Tweak basic-fixes: Tweak tmpfiles.d/provision.conf
CentOS · Mar 18, 2024 · ecb0254 · ecb0254
2 parents f8486c6 + 8ee104d
commit ecb0254
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/tier-0/basic-fixes.yaml b/tier-0/basic-fixes.yaml
@@ -24,3 +24,6 @@ postprocess:
     # work if we want to use tmpfiles.d to write to `/root/.ssh` because
     # tmpfiles gives up on that before getting to `/var/roothome`.
     sed -ie 's, /root, /var/roothome,' /usr/lib/tmpfiles.d/provision.conf
+    # Because /var/roothome is also defined in rpm-ostree-0-integration.conf
+    # we need to delete /var/roothome
+    sed -ie '/^d- \/var\/roothome /d' /usr/lib/tmpfiles.d/provision.conf