tmpfiles: get rid of "m" lines, make them redundant by "z"

[elogind.git] / tmpfiles.d / systemd.conf

diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
index 31fd97f0ba2733c8f64ced5a424fb79064a4d696..85dc35699da57305bba119fceeae71b654a7b9a2 100644 (file)
--- a/tmpfiles.d/systemd.conf
+++ b/tmpfiles.d/systemd.conf
@@ -1,27 +1,31 @@
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
 # See tmpfiles.d(5) for details
 
-d /run/lock 0755 root root -
-d /run/lock/subsys 0755 root root -
-d /run/lock/lockdev 0775 root lock -
-
-d /run/user 0755 root root 10d
-F /run/utmp 0664 root utmp -
+d /run/user 0755 root root ~10d
+F! /run/utmp 0664 root utmp -
 
 f /var/log/wtmp 0664 root utmp -
 f /var/log/btmp 0600 root utmp -
 
-d /tmp 1777 root root 10d
-d /var/tmp 1777 root root 30d
-
 d /var/cache/man - - - 30d
 
-r /forcefsck
-r /forcequotacheck
-r /fastboot
+d /run/systemd/ask-password 0755 root root -
+d /run/systemd/seats 0755 root root -
+d /run/systemd/sessions 0755 root root -
+d /run/systemd/users 0755 root root -
+d /run/systemd/machines 0755 root root -
+d /run/systemd/shutdown 0755 root root -
+d /run/systemd/netif 0755 systemd-network systemd-network -
+d /run/systemd/netif/links 0755 systemd-network systemd-network -
+d /run/systemd/netif/leases 0755 systemd-network systemd-network -
+
+z /var/log/journal 2755 root systemd-journal - -
+Z /var/log/journal/%m 2755 root systemd-journal - -
+z /run/log/journal 2755 root systemd-journal - -
+Z /run/log/journal/%m 2755 root systemd-journal - -