summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorMike Yuan <me@yhndnzj.com>2023-04-27 22:40:09 +0800
committerGitHub <noreply@github.com>2023-04-27 22:40:09 +0800
commit82060b62c98f262558d9b5d0b98f0c96cd675b6a (patch)
tree61693083b7b54d5216e7fd40ffae04b7188902c2 /man
parenta84e741b36ba0ad1e35b90d0f55753e825b848e8 (diff)
parentf582e61bc3a956fb09af66bcd6778b4dd5058e40 (diff)
downloadsystemd-82060b62c98f262558d9b5d0b98f0c96cd675b6a.tar.gz
Merge pull request #25622 from YHNdnzj/tmpfiles-X-bit-support
tmpfiles: add conditionalized execute permission (X) support
Diffstat (limited to 'man')
-rw-r--r--man/tmpfiles.d.xml16
1 files changed, 9 insertions, 7 deletions
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index a23b9c8946..54f3c501cb 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -446,13 +446,15 @@ L /tmp/foobar - - - - /dev/null</programlisting>
<term><varname>a+</varname></term>
<listitem><para>Set POSIX ACLs (access control lists), see <citerefentry
project='man-pages'><refentrytitle>acl</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>. If suffixed with <varname>+</varname>, the specified
- entries will be added to the existing set. <command>systemd-tmpfiles</command> will automatically
- add the required base entries for user and group based on the access mode of the file, unless base
- entries already exist or are explicitly specified. The mask will be added if not specified
- explicitly or already present. Lines of this type accept shell-style globs in place of normal path
- names. This can be useful for allowing additional access to certain files. Does not follow
- symlinks.</para></listitem>
+ <manvolnum>5</manvolnum></citerefentry>. Additionally, if 'X' is used, the execute bit is set only
+ if the file is a directory or already has execute permission for some user, as mentioned in
+ <citerefentry project='man-pages'><refentrytitle>setfacl</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
+ If suffixed with <varname>+</varname>, the specified entries will be added to the existing set.
+ <command>systemd-tmpfiles</command> will automatically add the required base entries for user
+ and group based on the access mode of the file, unless base entries already exist or are explicitly
+ specified. The mask will be added if not specified explicitly or already present. Lines of this type
+ accept shell-style globs in place of normal path names. This can be useful for allowing additional
+ access to certain files. Does not follow symlinks.</para></listitem>
</varlistentry>
<varlistentry>