X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Ftmpfiles.d.xml;h=5e0b5383412d7ef26b3e7be68f7ba62222d65096;hp=76cae39aae4345583ccbd3aef69e529eab603a81;hb=d6bd972d061af306ede2affd2c9340a1660f7996;hpb=e73a03e059830a3df8fac811f923704311e93731
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 76cae39aa..5e0b53834 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -109,7 +109,11 @@
of the directories they reside in. If multiple files
specify the same path, the entry in the file with the
lexicographically earliest name will be applied, all
- all other conflicting entries logged as errors.
+ all other conflicting entries will be logged as
+ errors. When two lines are prefix and suffix of each
+ other, then the prefix is always processed first, the
+ suffix later. Otherwise the files/directories are
+ processed in the order they are listed.
If the administrator wants to disable a
configuration file supplied by the vendor, the
@@ -165,27 +169,80 @@ L /tmp/foobar - - - - /dev/null
p
- Create a named pipe (FIFO) if it does not exist yet.
+ p+
+ Create a named
+ pipe (FIFO) if it does not
+ exist yet. If suffixed with
+ + and a
+ file already exists where the
+ pipe is to be created it will
+ be removed and be replaced by
+ the pipe.
L
- Create a symlink if it does not exist yet.
+ L+
+ Create a
+ symlink if it does not exist
+ yet. If suffixed with
+ + and a
+ file already exists where the
+ symlink is to be created it
+ will be removed and be
+ replaced by the
+ symlink. If the argument is omitted,
+ symlinks to files with the same name
+ residing in the directory
+ /usr/share/factory/
+ are created.
c
- Create a character device node if it does not exist yet.
+ c+
+ Create a
+ character device node if it
+ does not exist yet. If
+ suffixed with
+ + and a
+ file already exists where the
+ device node is to be created
+ it will be removed and be
+ replaced by the device
+ node.
b
- Create a block device node if it does not exist yet.
+ b+
+ Create a block
+ device node if it does not
+ exist yet. If suffixed with
+ + and a
+ file already exists where the
+ device node is to be created
+ it will be removed and be
+ replaced by the device
+ node.
C
- Recursively copy a file or directory, if the destination files or directories don't exist yet.
+ Recursively
+ copy a file or directory, if
+ the destination files or
+ directories don't exist
+ yet. Note that this command
+ will not descend into
+ subdirectories if the
+ destination directory already
+ exists, instead the entire
+ copy operation is
+ skipped. If the argument is omitted,
+ files from the source directory
+ /usr/share/factory/
+ with the same name are copied.
@@ -364,6 +421,22 @@ r! /tmp/.X[0-9]*-lock
ignored for x,
r, R,
L lines.
+
+ Optionally, if prefixed with
+ ~ the access mode is masked
+ based on the already set access bits for
+ existing file or directories: if the existing
+ file has all executable bits unset then all
+ executable bits are removed from the new
+ access mode, too. Similar, if all read bits
+ are removed from the old access mode they will
+ be removed from the new access mode too, and
+ if all write bits are removed, they will be
+ removed from the new access mode too. In
+ addition the sticky/suid/gid bit is removed unless
+ applied to a directory. This
+ functionality is particularly useful in
+ conjunction with Z.