diff options
| -rw-r--r-- | man/tmpfiles.d.xml | 14 | ||||
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml index acad6dcc01..67bd1dc724 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -368,15 +368,11 @@ L /tmp/foobar - - - - /dev/null</programlisting> <listitem><para>Set file/directory attributes. Lines of this type accept shell-style globs in place of normal path names.</para> - <para>The format of the argument field is - <varname>[+-=][aAcCdDeijsStTu] </varname>. The prefix - <varname>+</varname> (the default one) causes the - attribute(s) to be added; <varname>-</varname> causes the - attribute(s) to be removed; <varname>=</varname> causes the - attributes to be set exactly as the following letters. The - letters <literal>aAcCdDeijsStTu</literal> select the new - attributes for the files, see - <citerefentry project='man-pages'><refentrytitle>chattr</refentrytitle> + <para>The format of the argument field is <varname>[+-=][aAcCdDeijPsStTu] </varname>. The prefix + <varname>+</varname> (the default one) causes the attribute(s) to be added; <varname>-</varname> + causes the attribute(s) to be removed; <varname>=</varname> causes the attributes to be set exactly + as the following letters. The letters <literal>aAcCdDeijPsStTu</literal> select the new attributes + for the files, see <citerefentry project='man-pages'><refentrytitle>chattr</refentrytitle> <manvolnum>1</manvolnum></citerefentry> for further information. </para> <para>Passing only <varname>=</varname> as argument resets diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 96b619f8cc..5251c741ee 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -1110,7 +1110,8 @@ static int path_set_acls(Item *item, const char *path) { FS_UNRM_FL | \ FS_NOTAIL_FL | \ FS_TOPDIR_FL | \ - FS_NOCOW_FL) + FS_NOCOW_FL | \ + FS_PROJINHERIT_FL) static int parse_attribute_from_arg(Item *item) { @@ -1132,6 +1133,7 @@ static int parse_attribute_from_arg(Item *item) { { 't', FS_NOTAIL_FL }, /* file tail should not be merged */ { 'T', FS_TOPDIR_FL }, /* Top of directory hierarchies */ { 'C', FS_NOCOW_FL }, /* Do not cow file */ + { 'P', FS_PROJINHERIT_FL }, /* Inherit the quota project ID */ }; enum { |