From 062e01bbdbc3201e4c99bc0b702cb04a0ae2190c Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Fri, 16 Dec 2011 18:00:11 +0100
Subject: tmpfiles: apply chown, chmod for 'Z' entries too

If changing ownership or permissions is not desired, they can be
configured to '-' or omitted entirely.
---
 man/systemd-tmpfiles.xml |  3 ++-
 man/tmpfiles.d.xml       | 16 ++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'man')

diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index 20e399bfd4..74dfd5ac7e 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -85,7 +85,8 @@
                                 files and directories marked with f,
                                 F, d, D in the configuration files are
                                 created. Files and directories marked with Z
-                                are relabeled.</para></listitem>
+                                have their ownership, access mode and security
+                                labels set.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 6a2a3774ae..e137967654 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -158,8 +158,9 @@ d    /run/user 0755 root root 10d</programlisting>
 
                                 <varlistentry>
                                         <term><varname>Z</varname></term>
-                                        <listitem><para>Recursively
-                                        relabel security context of a path and
+                                        <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
@@ -174,8 +175,10 @@ d    /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
-                        directories, 0644 for files. This parameter is
-                        ignored for x, r, R, Z lines.</para>
+                        directories, 0644 for files. For 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>
@@ -185,8 +188,9 @@ d    /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)
-                        is used. . These parameters are ignored for x,
-                        r, R, Z lines.</para>
+                        is used. For 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>
-- 
cgit v1.2.3-54-g00ecf