anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0490-tmpfiles-don-t-recursively-descend-into-journal-dire.patch

803fb7
From 2a1f91ffc371f2bc3767a806ff387517ff9b9fc8 Mon Sep 17 00:00:00 2001
803fb7
From: Lennart Poettering <lennart@poettering.net>
803fb7
Date: Thu, 9 Jul 2015 18:43:55 -0300
803fb7
Subject: [PATCH] tmpfiles: don't recursively descend into journal directories
803fb7
 in /var
803fb7
803fb7
Do so only in /run. We shouldn't alter ACLs for existing files in /var,
803fb7
but only for new files. If the admin made changes to the ACLs they
803fb7
shouls stay in place.
803fb7
803fb7
We should still do recursive ACL changes for files in /run, since those
803fb7
are not persistent, and will hence lack ACLs on every boot.
803fb7
803fb7
Also, /var/log/journal might be quit large, /run/log/journal is usually
803fb7
not, hence we should avoid the recursive descending on /var, but not on
803fb7
/run.
803fb7
803fb7
Fixes #534
803fb7
803fb7
(cherry picked from commit 8b258a645ae63dff3ab8dde6520d2e770e2a40f1)
803fb7
Related: #1411199
803fb7
---
803fb7
 tmpfiles.d/systemd.conf.m4 | 2 +-
803fb7
 1 file changed, 1 insertion(+), 1 deletion(-)
803fb7
803fb7
diff --git a/tmpfiles.d/systemd.conf.m4 b/tmpfiles.d/systemd.conf.m4
803fb7
index b447b01f5..d9d51af92 100644
803fb7
--- a/tmpfiles.d/systemd.conf.m4
803fb7
+++ b/tmpfiles.d/systemd.conf.m4
803fb7
@@ -35,7 +35,7 @@ z /var/log/journal 2755 root systemd-journal - -
803fb7
 z /var/log/journal/%m 2755 root systemd-journal - -
803fb7
 m4_ifdef(`HAVE_ACL',``
803fb7
 a+ /var/log/journal/%m - - - - d:group:adm:r-x,d:group:wheel:r-x
803fb7
-A+ /var/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x
803fb7
+a+ /var/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x
803fb7
 '')m4_dnl
803fb7
 
803fb7
 d /var/lib/systemd 0755 root root -