summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2023-05-09 13:45:16 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2023-05-10 18:08:07 +0200
commit1fd5ec5697680e2ec6277431bd74cabf48dbc94f (patch)
tree1ab4c985f91268a8b3693be809f307989dc9cd5c /man
parente57b7020d2ee89d9c906bcefa091d31b067dedcc (diff)
downloadsystemd-1fd5ec5697680e2ec6277431bd74cabf48dbc94f.tar.gz
tmpfiles: Add merge support for copy files action
If '+' is specified with 'C', let's merge the tree with any existing tree.
Diffstat (limited to 'man')
-rw-r--r--man/tmpfiles.d.xml18
1 files changed, 9 insertions, 9 deletions
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>