summaryrefslogtreecommitdiff
path: root/man/tmpfiles.d.xml
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-06-10 18:26:11 +0200
committerKay Sievers <kay@vrfy.org>2012-06-10 18:26:11 +0200
commit6110885c2c4b7c576ac5819af5416ec54200d8e3 (patch)
tree5f6093154af8bda0cb9629d554a84cd17e938504 /man/tmpfiles.d.xml
parent4bf43a32a96465d2f9c244adea3e661075f208bf (diff)
downloadsystemd-6110885c2c4b7c576ac5819af5416ec54200d8e3.tar.gz
man: systemd-tmpfiles - document proper config-file-stack order
Diffstat (limited to 'man/tmpfiles.d.xml')
-rw-r--r--man/tmpfiles.d.xml36
1 files changed, 21 insertions, 15 deletions
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 5d4b2ac6d4..8987c48073 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -66,24 +66,30 @@
<refsect1>
<title>Configuration Format</title>
- <para>Each configuration file is named in the style of
- <filename>&lt;program&gt;.conf</filename>. Files in
- <filename>/etc/</filename> override files with the
- same name in <filename>/usr/lib/</filename>. Files in
- <filename>/run</filename> override files with the same
- name in <filename>/etc/</filename> and
- <filename>/usr/lib/</filename>. Packages should
- install their configuration files in
- <filename>/usr/lib/</filename>, files in
+ <para>Each configuration file shall be named in the
+ style of <filename>&lt;program&gt;.conf</filename>.
+ Files in <filename>/etc/</filename> override files
+ with the same name in <filename>/usr/lib/</filename>
+ and <filename>/run/</filename>. Files in
+ <filename>/run/</filename> override files with the same
+ name in <filename>/usr/lib/</filename>. Packages
+ should install their configuration files in
+ <filename>/usr/lib/</filename>. Files in
<filename>/etc/</filename> 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.</para>
+ directories they reside, to guarantee that a specific
+ configuration file takes precedence over another file
+ with an alphabetically later name</para>
+
+ <para>If the administrator wants to disable a
+ configuration file supplied by the vendor the
+ recommended way is to place a symlink to
+ <filename>/dev/null</filename> in
+ <filename>/etc/tmpfiles.d/</filename> bearing the
+ same file name.</para>
<para>The configuration format is one line per path
containing action, path, mode, ownership, age and argument