X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Ftmpfiles.d.xml;h=75d4bcd695796e6f2e13b03d4721a4c161737581;hp=5d4b2ac6d40ef18efa757a314bbf9169ca4beaff;hb=0e25e94ea72ca3db70484014280ddb709840f952;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 5d4b2ac6d..75d4bcd69 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -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.
-
- The configuration format is one line per path
- containing action, path, mode, ownership, age and argument
- fields:
+ directories they reside, to guarantee that a specific
+ configuration file takes precedence over another file
+ with an alphabetically later name
+
+ 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 -