summaryrefslogtreecommitdiff
path: root/tmpfiles.d
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-09-17 16:42:36 -0500
committerLennart Poettering <lennart@poettering.net>2013-09-17 16:55:37 -0500
commit4608af4333d0f7f5f8e3bc632801b04ef07d246d (patch)
treec8614f1e3cf783bf6e969c9d485fdd528f2c5b37 /tmpfiles.d
parent265ffa1e05acf12769a64d0734fd2472237c03c5 (diff)
downloadsystemd-4608af4333d0f7f5f8e3bc632801b04ef07d246d.tar.gz
systemd-4608af4333d0f7f5f8e3bc632801b04ef07d246d.tar.bz2
systemd-4608af4333d0f7f5f8e3bc632801b04ef07d246d.zip
journald: avoid NSS in journald
In order to avoid a deadlock between journald looking up the "systemd-journal" group name, and nscd (or anyother NSS backing daemon) logging something back to the journal avoid all NSS in journald the same way as we avoid it from PID 1. With this change we rely on the kernel file system logic to adjust the group of created journal files via the SETGID bit on the journal directory. To ensure that it is always set, even after the user created it with a simply "mkdir" on the shell we fix it up via tmpfiles on boot.
Diffstat (limited to 'tmpfiles.d')
-rw-r--r--tmpfiles.d/systemd.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
index 4924b4ec70..c397c71b75 100644
--- a/tmpfiles.d/systemd.conf
+++ b/tmpfiles.d/systemd.conf
@@ -23,3 +23,6 @@ d /run/systemd/machines 0755 root root -
d /run/systemd/shutdown 0755 root root -
F /run/nologin 0644 - - - "System is booting up."
+
+m /var/log/journal 2755 root systemd-journal - -
+m /var/log/journal/%m 2755 root systemd-journal - -