summaryrefslogtreecommitdiff
path: root/man/systemd-tmpfiles.xml
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-05-21 17:08:35 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-05-22 16:28:02 +0200
commit727036325a000f2c62d90b86d659a64fb6affb5d (patch)
tree572e5fff78e9d8e4763855232ae4d999d4e6c590 /man/systemd-tmpfiles.xml
parentd7c5b3ec3e5ea446c252c07d30c32170d4d1176a (diff)
downloadsystemd-727036325a000f2c62d90b86d659a64fb6affb5d.tar.gz
man: add note which tmpfiles services read which files
Fixes #12596.
Diffstat (limited to 'man/systemd-tmpfiles.xml')
-rw-r--r--man/systemd-tmpfiles.xml18
1 files changed, 17 insertions, 1 deletions
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index f05e5ea2e5..7720ef53fa 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -65,6 +65,22 @@
<citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>
are searched for a matching file and the file found that has the highest priority is
executed.</para>
+
+ <para>System services (<filename>systemd-tmpfiles-setup.service</filename>,
+ <filename>systemd-tmpfiles-setup-dev.service</filename>,
+ <filename>systemd-tmpfiles-clean.service</filename>) invoke <command>systemd-tmpfiles</command> to create
+ system files and to perform system wide cleanup. Those services read administrator-controlled
+ configuration files in <filename>tmpfiles.d/</filename> directories. User services
+ (<filename>systemd-tmpfiles-setup.service</filename>,
+ <filename>systemd-tmpfiles-clean.service</filename>) also invoke <command>systemd-tmpfiles</command>, but
+ it reads a separate set of files, which includes user-controlled files under
+ <filename>~/.config/user-tmpfiles.d/</filename> and <filename>~/.local/share/user-tmpfiles.d/</filename>,
+ and administrator-controller files under <filename>/usr/share/user-tmpfiles.d/</filename>. Users may use
+ this to create and clean up files under their control, but the system instance performs global cleanup
+ and is not influenced by user configuration. Note that this means a time-based cleanup configured in the
+ system instance, such as the one typically configured for <filename>/tmp</filename>, will thus also
+ affect files created by the user instance if they are placed in <filename>/tmp</filename>, even if the
+ user instance's time-based cleanup is turned off.</para>
</refsect1>
<refsect1>
@@ -174,7 +190,7 @@
</variablelist>
<para>It is possible to combine <option>--create</option>, <option>--clean</option>, and <option>--remove</option>
- in one invocation (in which case removal and clean-up are executed before creation of new files). For example,
+ in one invocation (in which case removal and cleanup are executed before creation of new files). For example,
during boot the following command line is executed to ensure that all temporary and volatile directories are
removed and created according to the configuration file:</para>