shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

man: systemd-tmpfiles - document proper config-file-stack order

Browse Source
This commit is contained in:
Kay Sievers 2012-06-10 18:26:11 +02:00
parent 4bf43a32a9
commit 6110885c2c
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/sysctl.d.xml
View File

@ -81,7 +81,7 @@
Files in <filename>/etc/</filename> override files Files in <filename>/etc/</filename> override files
with the same name in <filename>/usr/lib/</filename> with the same name in <filename>/usr/lib/</filename>
and <filename>/run/</filename>. Files in and <filename>/run/</filename>. Files in
<filename>/run</filename> override files with the same <filename>/run/</filename> override files with the same
name in <filename>/usr/lib/</filename>. Packages name in <filename>/usr/lib/</filename>. Packages
should install their configuration files in should install their configuration files in
<filename>/usr/lib/</filename>. Files in <filename>/usr/lib/</filename>. Files in

15
man/systemd-tmpfiles.xml
View File

@ -59,14 +59,14 @@
<para><command>systemd-tmpfiles</command> creates, <para><command>systemd-tmpfiles</command> creates,
deletes and cleans up volatile and temporary files and deletes and cleans up volatile and temporary files and
directories, based on the configuration from directories, based on the configuration file format and
<filename>/etc/tmpfiles.d/</filename>. See location specified in <citerefentry>
<citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry> <refentrytitle>tmpfiles.d</refentrytitle>
for more details on these files.</para> <manvolnum>5</manvolnum>
</citerefentry>.</para>
<para>If invoked with no arguments applies all <para>If invoked with no arguments, it applies all
directives from all configuration files in directives from all configuration files. If one or
<filename>/etc/tmpfiles.d/*.conf</filename>. If one or
more absolute file names are passed on the command more absolute file names are passed on the command
line only the directives in these files are line only the directives in these files are
applied.</para> applied.</para>
@ -145,7 +145,6 @@
<para> <para>
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>tmpwatch</refentrytitle><manvolnum>8</manvolnum></citerefentry>
</para> </para>
</refsect1> </refsect1>

36
man/tmpfiles.d.xml
View File

@ -66,24 +66,30 @@
<refsect1> <refsect1>
<title>Configuration Format</title> <title>Configuration Format</title>
<para>Each configuration file is named in the style of <para>Each configuration file shall be named in the
<filename>&lt;program&gt;.conf</filename>. Files in style of <filename>&lt;program&gt;.conf</filename>.
<filename>/etc/</filename> override files with the Files in <filename>/etc/</filename> override files
same name in <filename>/usr/lib/</filename>. Files in with the same name in <filename>/usr/lib/</filename>
<filename>/run</filename> override files with the same and <filename>/run/</filename>. Files in
name in <filename>/etc/</filename> and <filename>/run/</filename> override files with the same
<filename>/usr/lib/</filename>. Packages should name in <filename>/usr/lib/</filename>. Packages
install their configuration files in should install their configuration files in
<filename>/usr/lib/</filename>, files in <filename>/usr/lib/</filename>. Files in
<filename>/etc/</filename> are reserved for the local <filename>/etc/</filename> are reserved for the local
administrator, who may choose to override the administrator, who may use this logic to override the
configurations installed from packages. The list of configuration files installed by vendor packages. All
configuration files are sorted by their filename in configuration files are sorted by their filename in
alphabetical order, regardless in which of the alphabetical order, regardless in which of the
directories they reside, to guarantee that a directories they reside, to guarantee that a specific
configuration file takes precedence over another configuration file takes precedence over another file
configuration file with an alphabetically later with an alphabetically later name</para>
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 <para>The configuration format is one line per path
containing action, path, mode, ownership, age and argument containing action, path, mode, ownership, age and argument