From: Michal Schmidt <mschmidt@redhat.com>
Date: Thu, 15 Dec 2011 22:04:37 +0000 (+0100)
Subject: man: document 'Z' in tmpfiles
X-Git-Tag: v38~156
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=462d63db0680c2b69d5426ded197342372ebe309;hp=a8d8878329893d19106053e5008f0075f149aa16

man: document 'Z' in tmpfiles
---

diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index 08d5c73ce..20e399bfd 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -84,7 +84,8 @@
                                 <listitem><para>If this option is passed all
                                 files and directories marked with f,
                                 F, d, D in the configuration files are
-                                created.</para></listitem>
+                                created. Files and directories marked with Z
+                                are relabeled.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 7f4c45c96..580d99cfc 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -155,6 +155,16 @@ d    /run/user 0755 root root 10d</programlisting>
                                         place of normal path
                                         names.</para></listitem>
                                 </varlistentry>
+
+                                <varlistentry>
+                                        <term><varname>Z</varname></term>
+                                        <listitem><para>Recursively
+                                        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>