diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-11-27 19:13:34 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2020-01-31 15:04:08 +0100 |
| commit | 0f5a4f9cd9695081c63ff9040a471a5790851f53 (patch) | |
| tree | 31eda6fc4f4ad8f6442a88fbade3279467668d0e /tmpfiles.d | |
| parent | db23d83bd49bb04ffb96ce130d2ff004a60a248b (diff) | |
| download | systemd-0f5a4f9cd9695081c63ff9040a471a5790851f53.tar.gz | |
tmpfiles: merge lines for the same inodes
Diffstat (limited to 'tmpfiles.d')
| -rw-r--r-- | tmpfiles.d/systemd.conf.m4 | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/tmpfiles.d/systemd.conf.m4 b/tmpfiles.d/systemd.conf.m4 index 4914e8ec8c..b251c4bcde 100644 --- a/tmpfiles.d/systemd.conf.m4 +++ b/tmpfiles.d/systemd.conf.m4 @@ -32,17 +32,14 @@ Z /run/log/journal/%m ~2750 root systemd-journal - - m4_ifdef(`HAVE_ACL',`m4_dnl m4_ifdef(`ENABLE_ADM_GROUP',`m4_dnl m4_ifdef(`ENABLE_WHEEL_GROUP',`` -a+ /run/log/journal/%m - - - - d:group:adm:r-x,d:group:wheel:r-x -a+ /run/log/journal/%m - - - - 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-- '',`` -a+ /run/log/journal/%m - - - - d:group:adm:r-x -a+ /run/log/journal/%m - - - - 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-- '')',`m4_dnl m4_ifdef(`ENABLE_WHEEL_GROUP',`` -a+ /run/log/journal/%m - - - - d:group:wheel:r-x -a+ /run/log/journal/%m - - - - 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-- '')')')m4_dnl @@ -52,23 +49,17 @@ z /var/log/journal/%m/system.journal 0640 root systemd-journal - - m4_ifdef(`HAVE_ACL',`m4_dnl m4_ifdef(`ENABLE_ADM_GROUP',`m4_dnl m4_ifdef(`ENABLE_WHEEL_GROUP',`` -a+ /var/log/journal - - - - d:group::r-x,d:group:adm:r-x,d:group:wheel:r-x -a+ /var/log/journal - - - - group::r-x,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 - - - - 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+ /var/log/journal/%m - - - - d:group:adm:r-x,d:group:wheel:r-x,group:adm:r-x,group:wheel:r-x a+ /var/log/journal/%m/system.journal - - - - group:adm:r--,group:wheel:r-- '', `` -a+ /var/log/journal - - - - d:group::r-x,d:group:adm:r-x -a+ /var/log/journal - - - - group::r-x,group:adm:r-x -a+ /var/log/journal/%m - - - - d:group:adm:r-x -a+ /var/log/journal/%m - - - - group:adm:r-x +a+ /var/log/journal - - - - d:group::r-x,d:group:adm:r-x,group::r-x,group:adm:r-x +a+ /var/log/journal/%m - - - - d:group:adm:r-x,group:adm:r-x a+ /var/log/journal/%m/system.journal - - - - group:adm:r-- '')',`m4_dnl m4_ifdef(`ENABLE_WHEEL_GROUP',`` -a+ /var/log/journal - - - - d:group::r-x,d:group:wheel:r-x -a+ /var/log/journal - - - - group::r-x,group:wheel:r-x -a+ /var/log/journal/%m - - - - d:group:wheel:r-x -a+ /var/log/journal/%m - - - - group:wheel:r-x +a+ /var/log/journal - - - - d:group::r-x,d:group:wheel:r-x,group::r-x,group:wheel:r-x +a+ /var/log/journal/%m - - - - d:group:wheel:r-x,group:wheel:r-x a+ /var/log/journal/%m/system.journal - - - - group:wheel:r-- '')')')m4_dnl |