man: fix misplaced remark in description of Sockets=

[elogind.git] / man / tmpfiles.d.xml

diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 868b57e93517feab6b74c6d2f6ea8629a24f2269..4a8e8316cde6a095f30f9c363c456590ad31f05d 100644 (file)
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -47,32 +47,47 @@
         </refnamediv>
 
         <refsynopsisdiv>
         </refnamediv>
 
         <refsynopsisdiv>

+                <para><filename>/usr/lib/tmpfiles.d/*.conf</filename></para>

                 <para><filename>/etc/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
         </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
                creation, cleaning and removal of volatile and
                temporary files and directories which usually reside

-               in directories such as <filename>/var/run</filename>
-               or <filename>/tmp</filename>. Each configuration file
-               is named in the style of
-               <filename>/etc/tmpfiles.d/&lt;program&gt;.conf</filename>.</para>
+               in directories such as <filename>/run</filename>
+               or <filename>/tmp</filename>.</para>

         </refsect1>
 
         <refsect1>
                <title>Configuration Format</title>
 
         </refsect1>
 
         <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> 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>
 
                 <programlisting>Type Path          Mode UID  GID  Age
                <para>The configuration format is one line per path
                containing action, mode, ownership and age
                fields:</para>
 
                 <programlisting>Type Path          Mode UID  GID  Age

-d    /var/run/user 0755 root root 10d</programlisting>
+d    /run/user 0755 root root 10d</programlisting>

 
                 <refsect2>
                         <title>Type</title>
 
                 <refsect2>
                         <title>Type</title>


@@ -97,6 +112,11 @@ d    /var/run/user 0755 root root 10d</programlisting>
                                         <listitem><para>Create or empty a directory</para></listitem>
                                 </varlistentry>
 
                                         <listitem><para>Create or empty a directory</para></listitem>
                                 </varlistentry>
 

+                                <varlistentry>
+                                        <term><varname>p</varname></term>
+                                        <listitem><para>Create a named pipe (FIFO) if it doesn't exist yet</para></listitem>
+                                </varlistentry>
+

                                 <varlistentry>
                                         <term><varname>x</varname></term>
                                         <listitem><para>Ignore a path
                                 <varlistentry>
                                         <term><varname>x</varname></term>
                                         <listitem><para>Ignore a path


@@ -135,6 +155,27 @@ d    /var/run/user 0755 root root 10d</programlisting>
                                         place of normal path
                                         names.</para></listitem>
                                 </varlistentry>
                                         place of normal path
                                         names.</para></listitem>
                                 </varlistentry>

+
+                                <varlistentry>
+                                        <term><varname>z</varname></term>
+                                        <listitem><para>Set ownership, access
+                                        mode and relabel security context of
+                                        a file or directory if it exists.
+                                        Lines of this type accept shell-style
+                                        globs in place of normal path names.
+                                        </para></listitem>
+                                </varlistentry>
+
+                                <varlistentry>
+                                        <term><varname>Z</varname></term>
+                                        <listitem><para>Recursively set
+                                        ownership, access mode and relabel
+                                        security context of a path and
+                                        all its subdirectories (if it is a
+                                        directory). Lines of this type accept
+                                        shell-style globs in place of normal
+                                        path names.</para></listitem>
+                                </varlistentry>

                         </variablelist>
                 </refsect2>
 
                         </variablelist>
                 </refsect2>
 


@@ -144,8 +185,10 @@ d    /var/run/user 0755 root root 10d</programlisting>
                         <para>The file access mode to use when
                         creating this file or directory. If omitted or
                         when set to - the default is used: 0755 for
                         <para>The file access mode to use when
                         creating this file or directory. If omitted or
                         when set to - the default is used: 0755 for

-                        directories, 0644 for files. This parameter is
-                        ignored for x, r, R lines.</para>
+                        directories, 0644 for files. For z, Z lines
+                        if omitted or when set to - the file access mode will
+                        not be modified. This parameter is ignored for x, r, R
+                        lines.</para>

                 </refsect2>
 
                 <refsect2>
                 </refsect2>
 
                 <refsect2>


@@ -155,8 +198,9 @@ d    /var/run/user 0755 root root 10d</programlisting>
                         or directory. This may either be a numeric
                         user/group ID or a user or group name. If
                         omitted or when set to - the default 0 (root)
                         or directory. This may either be a numeric
                         user/group ID or a user or group name. If
                         omitted or when set to - the default 0 (root)

-                        is used. . These parameters are ignored for x,
-                        r, R lines.</para>
+                        is used. For z, Z lines when omitted or when set to -
+                        the file ownership will not be modified.
+                        These parameters are ignored for x, r, R lines.</para>

                 </refsect2>
 
                 <refsect2>
                 </refsect2>
 
                 <refsect2>


@@ -181,10 +225,12 @@ d    /var/run/user 0755 root root 10d</programlisting>
                                 <term><varname>us</varname></term></varlistentry>
                         </variablelist>
 
                                 <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>
                 </refsect2>
 
         </refsect1>