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