diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/org.freedesktop.systemd1.xml | 4 | ||||
| -rw-r--r-- | man/tmpfiles.d.xml | 18 |
2 files changed, 9 insertions, 13 deletions
diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index f2e892671a..09bde73af1 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -2468,10 +2468,6 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { <varname>IgnoreOnIsolate</varname>, <varname>IgnoreOnSnapshot</varname> map directly to the corresponding configuration booleans in the unit file.</para> - <para><varname>DefaultControlGroup</varname> contains the main control group of this unit as a - string. This refers to a group in systemd's own <literal>name=systemd</literal> hierarchy, which - systemd uses to watch and manipulate the unit and all its processes.</para> - <para><varname>NeedDaemonReload</varname> is a boolean that indicates whether the configuration file this unit is loaded from (i.e. <varname>FragmentPath</varname> or <varname>SourcePath</varname>) has changed since the configuration was read and hence whether a configuration reload is recommended. diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml index 54f3c501cb..a105b8af39 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -58,6 +58,7 @@ c+ /dev/char-device-to-[re]create mode user group - major b /dev/block-device-to-create mode user group - major:minor b+ /dev/block-device-to-[re]create mode user group - major:minor C /target/to/create - - - cleanup-age /source/to/copy +C+ /target/to/create - - - cleanup-age /source/to/copy x /path-or-glob/to/ignore/recursively - - - cleanup-age - X /path-or-glob/to/ignore - - - cleanup-age - r /path-or-glob/to/remove - - - - - @@ -326,15 +327,14 @@ L /tmp/foobar - - - - /dev/null</programlisting> <varlistentry> <term><varname>C</varname></term> - <listitem><para>Recursively copy a file or directory, if the - destination files or directories do not exist yet or the - destination directory is empty. Note that this command will not - descend into subdirectories if the destination directory already - exists and is not empty. Instead, the entire copy operation is - skipped. If the argument is omitted, files from the source directory - <filename>/usr/share/factory/</filename> with the same name - are copied. Does not follow symlinks. Contents of the directories - are subject to time-based cleanup if the age argument is specified. + <term><varname>C+</varname></term> + <listitem><para>Recursively copy a file or directory, if the destination files or directories do + not exist yet or the destination directory is empty. Note that this command will not descend into + subdirectories if the destination directory already exists and is not empty, unless the action is + suffixed with <varname>+</varname>. Instead, the entire copy operation is skipped. If the argument + is omitted, files from the source directory <filename>/usr/share/factory/</filename> with the same + name are copied. Does not follow symlinks. Contents of the directories are subject to time-based + cleanup if the age argument is specified. </para></listitem> </varlistentry> |