summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2011-12-16 18:27:35 +0100
committerMichal Schmidt <mschmidt@redhat.com>2011-12-16 18:27:35 +0100
commit777b87e702197ad1f2d0f2a3aea5271d18062c5c (patch)
treef16a5a7d2279ff32c5388d348b9959451e9419f5 /man
parent062e01bbdbc3201e4c99bc0b702cb04a0ae2190c (diff)
tmpfiles: add 'z', like 'Z' but not recursive
Diffstat (limited to 'man')
-rw-r--r--man/systemd-tmpfiles.xml4
-rw-r--r--man/tmpfiles.d.xml14
2 files changed, 14 insertions, 4 deletions
diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml
index 74dfd5ac7e..bbb80b2f98 100644
--- a/man/systemd-tmpfiles.xml
+++ b/man/systemd-tmpfiles.xml
@@ -84,8 +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. Files and directories marked with Z
- have their ownership, access mode and security
+ created. Files and directories marked with z,
+ Z have their ownership, access mode and security
labels set.</para></listitem>
</varlistentry>
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index e137967654..4a8e8316cd 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -157,6 +157,16 @@ d /run/user 0755 root root 10d</programlisting>
</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
@@ -175,7 +185,7 @@ 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. For Z lines
+ 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>
@@ -188,7 +198,7 @@ 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. For Z lines when omitted or when set to -
+ 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>