diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | tmpfiles.d/systemd.conf | 3 | ||||
| -rw-r--r-- | tmpfiles.d/tmp.conf | 12 |
3 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index ef3bd846c6..c1a4a5f1b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -301,6 +301,7 @@ dist_bashcompletion_DATA = \ dist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ + tmpfiles.d/tmp.conf \ tmpfiles.d/x11.conf if HAVE_SYSV_COMPAT diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf index 7d4b356a12..be29c068af 100644 --- a/tmpfiles.d/systemd.conf +++ b/tmpfiles.d/systemd.conf @@ -13,9 +13,6 @@ 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 diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf new file mode 100644 index 0000000000..8915b82ab5 --- /dev/null +++ b/tmpfiles.d/tmp.conf @@ -0,0 +1,12 @@ +# 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 +# (at your option) any later version. + +# See tmpfiles.d(5) for details + +# Clear tmp directories separately, to make them easier to override +d /tmp 1777 root root 10d +d /var/tmp 1777 root root 30d |