From 2ac0841d6fcb577cb485140d70f5b5355a45b85a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 04:23:16 +0200 Subject: Merging upstream version 252.26. Signed-off-by: Daniel Baumann --- tmpfiles.d/systemd.conf.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tmpfiles.d') diff --git a/tmpfiles.d/systemd.conf.in b/tmpfiles.d/systemd.conf.in index 74f35cc..01cd7d8 100644 --- a/tmpfiles.d/systemd.conf.in +++ b/tmpfiles.d/systemd.conf.in @@ -26,13 +26,16 @@ Z /run/log/journal/%m ~2750 root systemd-journal - - {% if HAVE_ACL %} {% if ENABLE_ADM_GROUP and ENABLE_WHEEL_GROUP %} a+ /run/log/journal - - - - d:group::r-x,d:group:adm:r-x,d:group:wheel:r-x,group::r-x,group:adm:r-x,group:wheel:r-x -A+ /run/log/journal/%m - - - - d:group:adm:r-x,d:group:wheel:r-x,group:adm:r-X,group:wheel:r-X +a+ /run/log/journal/%m - - - - d:group:adm:r-x,d:group:wheel:r-x,group:adm:r-x,group:wheel:r-x +a+ /run/log/journal/%m/*.journal* - - - - group:adm:r--,group:wheel:r-- {% elif ENABLE_ADM_GROUP %} a+ /run/log/journal - - - - d:group::r-x,d:group:adm:r-x,group::r-x,group:adm:r-x -A+ /run/log/journal/%m - - - - d:group:adm:r-x,group:adm:r-X +a+ /run/log/journal/%m - - - - d:group:adm:r-x,group:adm:r-x +a+ /run/log/journal/%m/*.journal* - - - - group:adm:r-- {% elif ENABLE_WHEEL_GROUP %} a+ /run/log/journal - - - - d:group::r-x,d:group:wheel:r-x,group::r-x,group:wheel:r-x -A+ /run/log/journal/%m - - - - d:group:wheel:r-x,group:wheel:r-X +a+ /run/log/journal/%m - - - - d:group:wheel:r-x,group:wheel:r-x +a+ /run/log/journal/%m/*.journal* - - - - group:wheel:r-- {% endif %} {% endif %} -- cgit v1.2.3