From e02e2cd119d731cdd830c9b4f5312ed35d2ad6ba Mon Sep 17 00:00:00 2001

From: Lennart Poettering <lennart@poettering.net>

Date: Mon, 12 Mar 2012 21:51:39 +0100

Subject: [PATCH] man: reword tmpfiles selinux bits (cherry picked from commit

 669e49fe2c841e53f7f2196bbe5d614013429ecd)

---

 man/tmpfiles.d.xml |   29 +++++++++++++++++------------

 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml

index 4a8e831..74fcc75 100644

--- a/man/tmpfiles.d.xml

+++ b/man/tmpfiles.d.xml

@@ -158,23 +158,28 @@ d    /run/user 0755 root root 10d</programlisting>

                                 <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.

+                                        <listitem><para>Restore

+                                        SELinux security context label

+                                        and set ownership and access

+                                        mode 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>

+                                        <listitem><para>Recursively

+                                        restore SELinux security

+                                        context label and set

+                                        ownership and access mode 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>