Skip to content

Commit

Permalink
Revert "tmpfiles.d/systemd: use ACL 'X' bit where appropriate"
Browse files Browse the repository at this point in the history
The feature was introduced in v254, so 'X' is not available in this branch.

Fixes #402

This reverts commit 19904f5.
  • Loading branch information
bluca committed May 26, 2024
1 parent e7871e7 commit 8987020
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions tmpfiles.d/systemd.conf.in
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down

0 comments on commit 8987020

Please sign in to comment.