anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0492-tmpfiles-set-acls-on-system.journal-explicitly.patch

803fb7
From d38e703a133487218c91f1e76072fc6b35c0978c Mon Sep 17 00:00:00 2001
803fb7
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
803fb7
Date: Sun, 29 Nov 2015 18:48:40 -0500
803fb7
Subject: [PATCH] tmpfiles: set acls on system.journal explicitly
803fb7
803fb7
https://github.com/systemd/systemd/issues/1397
803fb7
(cherry picked from commit afae249efa4774c6676738ac5de6aeb4daf4889f)
803fb7
Resolves: #1411199
803fb7
---
803fb7
 tmpfiles.d/systemd.conf.m4 | 2 ++
803fb7
 1 file changed, 2 insertions(+)
803fb7
803fb7
diff --git a/tmpfiles.d/systemd.conf.m4 b/tmpfiles.d/systemd.conf.m4
803fb7
index fcd6ec026..0575408db 100644
803fb7
--- a/tmpfiles.d/systemd.conf.m4
803fb7
+++ b/tmpfiles.d/systemd.conf.m4
803fb7
@@ -33,11 +33,13 @@ A+ /run/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x
803fb7
 
803fb7
 z /var/log/journal 2755 root systemd-journal - -
803fb7
 z /var/log/journal/%m 2755 root systemd-journal - -
803fb7
+z /var/log/journal/%m/system.journal 0640 root systemd-journal - -
803fb7
 m4_ifdef(`HAVE_ACL',``
803fb7
 a+ /var/log/journal    - - - - d:group:adm:r-x,d:group:wheel:r-x
803fb7
 a+ /var/log/journal    - - - - group:adm:r-x,group:wheel:r-x
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/system.journal - - - - group:adm:r--,group:wheel:r--
803fb7
 '')m4_dnl
803fb7
 
803fb7
 d /var/lib/systemd 0755 root root -