diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2011-04-25 21:38:21 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2011-04-25 21:38:21 +0200 |
| commit | 772f83719e3c2262d948a4c4e70fe9babc4c4610 (patch) | |
| tree | 973ea77bd6d44c6a96518b8bf9c0ee9aa43159fe /man | |
| parent | db1413d7380acacc4e50faf801ca0d401da89764 (diff) | |
tmpfiles.d: switch to stacked config dirs in /lib, /etc, /run
Diffstat (limited to 'man')
| -rw-r--r-- | man/binfmt.d.xml | 8 | ||||
| -rw-r--r-- | man/modules-load.d.xml | 4 | ||||
| -rw-r--r-- | man/sysctl.d.xml | 12 | ||||
| -rw-r--r-- | man/tmpfiles.d.xml | 33 |
4 files changed, 38 insertions, 19 deletions
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml index 5a8803f661..966778ded2 100644 --- a/man/binfmt.d.xml +++ b/man/binfmt.d.xml @@ -57,9 +57,7 @@ <para><command>systemd</command> uses files from the above directories to configure additional binary formats to register during boot in - the kernel. Each configuration file is named in the - style of - <filename><program>.conf</filename>.</para> + the kernel.</para> </refsect1> <refsect1> @@ -75,7 +73,9 @@ ignored. Note that this means you may not use ; and # as delimiter in binary format rules.</para> - <para>Files in <filename>/etc/</filename> overwrite + <para>Each configuration file is named in the style of + <filename><program>.conf</filename>. + Files in <filename>/etc/</filename> overwrite files with the same name in <filename>/usr/lib/</filename>. Files in <filename>/run</filename> overwrite files with the same name in <filename>/etc/</filename> and diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml index b2f15dc7b6..b633663475 100644 --- a/man/modules-load.d.xml +++ b/man/modules-load.d.xml @@ -74,7 +74,9 @@ newlines. Empty lines and lines whose first non-whitespace character is # or ; are ignored.</para> - <para>Files in <filename>/etc/</filename> overwrite + <para>Each configuration file is named in the style of + <filename><program>.conf</filename>. + Files in <filename>/etc/</filename> overwrite files with the same name in <filename>/usr/lib/</filename>. Files in <filename>/run</filename> overwrite files with the same name in <filename>/etc/</filename> and diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml index 51afbfa77a..240aa81137 100644 --- a/man/sysctl.d.xml +++ b/man/sysctl.d.xml @@ -54,12 +54,10 @@ <refsect1> <title>Description</title> - <para><command>systemd</command> uses - <filename>/etc/sysctl.d/</filename> to configure + <para><command>systemd</command> uses configuration files + from the above directories to configure <citerefentry><refentrytitle>sysctl</refentrytitle><manvolnum>8</manvolnum></citerefentry> - kernel parameters to load during boot. Each - configuration file is named in the style of - <filename>/etc/sysctl.d/<program>.conf</filename>.</para> + kernel parameters to load during boot.</para> </refsect1> <refsect1> @@ -73,7 +71,9 @@ <para>Note that both / and . are accepted as separators in sysctl variable names.</para> - <para>Files in <filename>/etc/</filename> overwrite + <para>Each configuration file is named in the style of + <filename><program>.conf</filename>. + Files in <filename>/etc/</filename> overwrite files with the same name in <filename>/usr/lib/</filename>. Files in <filename>/run</filename> overwrite files with the same name in <filename>/etc/</filename> and diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml index 8568fcd59c..abc74ef6f1 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -47,26 +47,41 @@ </refnamediv> <refsynopsisdiv> + <para><filename>/usr/lib/tmpfiles.d/*.conf</filename></para> <para><filename>/etc/tmpfiles.d/*.conf</filename></para> + <para><filename>/run/tmpfiles.d/*.conf</filename></para> </refsynopsisdiv> <refsect1> <title>Description</title> <para><command>systemd-tmpfiles</command> uses the - configuration files in - <filename>/etc/tmpfiles.d/</filename> to describe 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 <filename>/run</filename> - or <filename>/tmp</filename>. Each configuration file - is named in the style of - <filename>/etc/tmpfiles.d/<program>.conf</filename>.</para> + or <filename>/tmp</filename>.</para> </refsect1> <refsect1> <title>Configuration Format</title> + <para>Each configuration file is named in the style of + <filename><program>.conf</filename>. + Files in <filename>/etc/</filename> overwrite + files with the same name in <filename>/usr/lib/</filename>. + Files in <filename>/run</filename> overwrite 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 <filename>/etc/</filename> are reserved for the local + administration, which possibly decides to overwrite the + configurations installed from packages. All files are sorted + by filename in alphabetical order, regardless in which of the + directories they reside, to ensure that a specific + configuration file takes precedence over another file with + an alphabetically later name.</para> + <para>The configuration format is one line per path containing action, mode, ownership and age fields:</para> @@ -181,10 +196,12 @@ d /run/user 0755 root root 10d</programlisting> <term><varname>us</varname></term></varlistentry> </variablelist> - <para>If multiple integers and units are specified the time values are summed up.</para> - - <para>The age field only applies to lines starting with d, D and x. If omitted or set to - no automatic clean-up is done.</para> + <para>If multiple integers and units are specified the time + values are summed up.</para> + <para>The age field only applies to lines starting with + d, D and x. If omitted or set to - no automatic clean-up + is done.</para> </refsect2> </refsect1> |