diff options
Diffstat (limited to 'tmpfiles.d')
| -rw-r--r-- | tmpfiles.d/meson.build | 1 | ||||
| -rw-r--r-- | tmpfiles.d/systemd-tmp.conf | 18 | ||||
| -rw-r--r-- | tmpfiles.d/tmp.conf | 10 |
3 files changed, 19 insertions, 10 deletions
diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build index 35eea2be5c..b94a9d0f47 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build @@ -6,6 +6,7 @@ tmpfiles = [['home.conf', ''], ['journal-nocow.conf', ''], ['systemd-nologin.conf', ''], ['systemd-nspawn.conf', 'ENABLE_MACHINED'], + ['systemd-tmp.conf', ''], ['portables.conf', 'ENABLE_PORTABLED'], ['tmp.conf', ''], ['x11.conf', ''], diff --git a/tmpfiles.d/systemd-tmp.conf b/tmpfiles.d/systemd-tmp.conf new file mode 100644 index 0000000000..beb77dd0e0 --- /dev/null +++ b/tmpfiles.d/systemd-tmp.conf @@ -0,0 +1,18 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# 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 + +# Exclude namespace mountpoints created with PrivateTmp=yes +x /tmp/systemd-private-%b-* +X /tmp/systemd-private-%b-*/tmp +x /var/tmp/systemd-private-%b-* +X /var/tmp/systemd-private-%b-*/tmp + +# Remove top-level private temporary directories on each boot +R! /tmp/systemd-private-* +R! /var/tmp/systemd-private-* diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf index 22555a0076..fe5225d751 100644 --- a/tmpfiles.d/tmp.conf +++ b/tmpfiles.d/tmp.conf @@ -10,13 +10,3 @@ # Clear tmp directories separately, to make them easier to override q /tmp 1777 root root 10d q /var/tmp 1777 root root 30d - -# Exclude namespace mountpoints created with PrivateTmp=yes -x /tmp/systemd-private-%b-* -X /tmp/systemd-private-%b-*/tmp -x /var/tmp/systemd-private-%b-* -X /var/tmp/systemd-private-%b-*/tmp - -# Remove top-level private temporary directories on each boot -R! /tmp/systemd-private-* -R! /var/tmp/systemd-private-* |