X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Ftmpfiles.d.xml;h=a86ef3369507fa3acdcc4fb16ce66d79bd378df0;hb=5198dabcce9da535c4531b53990cfa11bd9f7896;hp=f70bf0ef9f712257d367fd2793127fd60f156804;hpb=fc1a2e06a2eab6ca16664adb83b61fe958f00598;p=elogind.git
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index f70bf0ef9..a86ef3369 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -7,16 +7,16 @@
Copyright 2010 Brandon Philips
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.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
-->
@@ -55,39 +55,45 @@
Description
- systemd-tmpfiles uses the
- configuration files from the above directories to describe the
- creation, cleaning and removal of volatile and
- temporary files and directories which usually reside
- in directories such as /run
- or /tmp.
+ systemd-tmpfiles uses the
+ configuration files from the above directories to describe the
+ creation, cleaning and removal of volatile and
+ temporary files and directories which usually reside
+ in directories such as /run
+ or /tmp.
- Configuration Format
-
- Each configuration file is named in the style of
- <program>.conf. Files in
- /etc/ override files with the
- same name in /usr/lib/. Files in
- /run override files with the same
- name in /etc/ and
- /usr/lib/. Packages should
- install their configuration files in
- /usr/lib/, files in
+ Configuration Format
+
+ Each configuration file shall be named in the
+ style of <program>.conf.
+ Files in /etc/ override files
+ with the same name in /usr/lib/
+ and /run/. Files in
+ /run/ override files with the same
+ name in /usr/lib/. Packages
+ should install their configuration files in
+ /usr/lib/. Files in
/etc/ are reserved for the local
- administrator, who may choose to override the
- configurations installed from packages. The list of
+ administrator, who may use this logic to override the
+ configuration files installed by vendor packages. All
configuration files are sorted by their filename in
alphabetical order, regardless in which of the
- directories they reside, to guarantee that a
- configuration file takes precedence over another
- configuration file with an alphabetically later
- name.
+ directories they reside, to guarantee that a specific
+ configuration file takes precedence over another file
+ with an alphabetically later name.
- The configuration format is one line per path
- containing action, path, mode, ownership, age and argument
- fields:
+ If the administrator wants to disable a
+ configuration file supplied by the vendor the
+ recommended way is to place a symlink to
+ /dev/null in
+ /etc/tmpfiles.d/ bearing the
+ same file name.
+
+ The configuration format is one line per path
+ containing action, path, mode, ownership, age and argument
+ fields:
Type Path Mode UID GID Age Argument
d /run/user 0755 root root 10d -
@@ -108,7 +114,10 @@ L /tmp/foobar - - - - /dev/null
w
- Write the argument parameter to a file, if it exists.
+ Write the argument parameter to a file, if the file exists.
+ Lines of this type accept shell-style globs in place of normal path
+ names. The argument parameter will be written without a trailing
+ newline. C-style backslash escapes are interpreted.
@@ -261,6 +270,12 @@ L /tmp/foobar - - - - /dev/null
The age field only applies to lines starting with
d, D and x. If omitted or set to - no automatic clean-up
is done.
+
+ If the age field starts with a tilde
+ character (~) the clean-up is only applied to
+ files and directories one level inside the
+ directory specified, but not the files and
+ directories immediately inside it.
@@ -293,7 +308,8 @@ d /var/run/uscreens 0755 root root 10d12h
See Also
systemd1,
- systemd-tmpfiles8
+ systemd-tmpfiles8,
+ systemd-delta1