tmpfiles.d/systemd.conf: Make ACL for "adm" actually work

Drop "wheel" ACL, that group does not exist in Debian.
This commit is contained in:
Martin Pitt 2015-02-17 13:03:03 +01:00
parent f4824fa9ee
commit fa9335ec4e
2 changed files with 28 additions and 2 deletions

2
debian/changelog vendored
View File

@ -17,6 +17,8 @@ systemd (219-1) UNRELEASED; urgency=medium
* debian/systemd.install: Add new systemd-hwdb and language-fallback-map
files.
* debian/libsystemd0.symbols: Add new symbols from this release.
* tmpfiles.d/systemd.conf: Drop "wheel" ACL (that group does not exist in
Debian) to make the ACL for "adm" actually work.
* /lib/lsb/init-functions.d/40-systemd: Call systemctl is-system-running
with --quiet. (LP: #1421058)
* debian/systemd.postrm: Clean getty@tty1.service and remote-fs.target

View File

@ -3,8 +3,9 @@ Date: Wed, 29 Jun 2011 13:57:07 +0200
Subject: Fix up tmpfiles.d permissions properly
---
tmpfiles.d/legacy.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
tmpfiles.d/legacy.conf | 4 ++--
tmpfiles.d/systemd.conf | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tmpfiles.d/legacy.conf b/tmpfiles.d/legacy.conf
index 3219672..a634c17 100644
@ -28,3 +29,26 @@ index 3219672..a634c17 100644
# /forcefsck, /fastboot and /forcequotecheck are deprecated in favor of the
# kernel command line options 'fsck.mode=force', 'fsck.mode=skip' and
diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
index 9634c2c..c3fc817 100644
--- a/tmpfiles.d/systemd.conf
+++ b/tmpfiles.d/systemd.conf
@@ -25,14 +25,14 @@ d /run/log 0755 root root -
z /run/log/journal 2755 root systemd-journal - -
Z /run/log/journal/%m ~2750 root systemd-journal - -
-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
+A+ /run/log/journal/%m - - - - group:adm:r-x
z /var/log/journal 2755 root systemd-journal - -
z /var/log/journal/%m 2755 root systemd-journal - -
-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 - - - - d:group:adm:r-x
+A+ /var/log/journal/%m - - - - group:adm:r-x
d /var/lib/systemd 0755 root root -
d /var/lib/systemd/coredump 0755 root root 3d