You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
1.3 KiB
31 lines
1.3 KiB
7 years ago
|
From d38e703a133487218c91f1e76072fc6b35c0978c Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Sun, 29 Nov 2015 18:48:40 -0500
|
||
|
|
Subject: [PATCH] tmpfiles: set acls on system.journal explicitly
|
||
|
|
|
||
|
|
https://github.com/systemd/systemd/issues/1397
|
||
|
|
(cherry picked from commit afae249efa4774c6676738ac5de6aeb4daf4889f)
|
||
|
|
Resolves: #1411199
|
||
|
|
---
|
||
|
|
tmpfiles.d/systemd.conf.m4 | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/tmpfiles.d/systemd.conf.m4 b/tmpfiles.d/systemd.conf.m4
|
||
|
|
index fcd6ec026..0575408db 100644
|
||
|
|
--- a/tmpfiles.d/systemd.conf.m4
|
||
|
|
+++ b/tmpfiles.d/systemd.conf.m4
|
||
|
|
@@ -33,11 +33,13 @@ A+ /run/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x
|
||
|
|
|
||
|
|
z /var/log/journal 2755 root systemd-journal - -
|
||
|
|
z /var/log/journal/%m 2755 root systemd-journal - -
|
||
|
|
+z /var/log/journal/%m/system.journal 0640 root systemd-journal - -
|
||
|
|
m4_ifdef(`HAVE_ACL',``
|
||
|
|
a+ /var/log/journal - - - - d:group:adm:r-x,d:group:wheel:r-x
|
||
|
|
a+ /var/log/journal - - - - group:adm:r-x,group:wheel:r-x
|
||
|
|
a+ /var/log/journal/%m - - - - d:group:adm:r-x,d:group:wheel:r-x
|
||
|
|
a+ /var/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x
|
||
|
|
+a+ /var/log/journal/%m/system.journal - - - - group:adm:r--,group:wheel:r--
|
||
|
|
'')m4_dnl
|
||
|
|
|
||
|
|
d /var/lib/systemd 0755 root root -
|