X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Ftmpfiles.d.xml;h=1b14d69a91dfceee88c0fdd74b50686f653f3cfa;hp=0081a6762aee3bc3d137b09c03c1be93b2a49ef4;hb=80877656a557231f8187f7bc371fd4cb3b70de5a;hpb=abef3f91ce5fa9eeffceead885d2d2cabd9f1c96
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 0081a6762..1b14d69a9 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -108,11 +108,11 @@
filename in lexicographic order, regardless of which
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 will be logged as
+ lexicographically earliest name will be applied.
+ 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
+ suffix later. Otherwise, the files/directories are
processed in the order they are listed.
If the administrator wants to disable a
@@ -169,27 +169,90 @@ 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. It is recommended to suffix this
+ entry with an exclamation mark to only
+ create static device nodes at boot,
+ as udev will not manage static device
+ nodes that are created at runtime.
+
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. It is recommended to suffix this
+ entry with an exclamation mark to only
+ create static device nodes at boot,
+ as udev will not manage static device
+ nodes that are created at runtime.
+
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 do not 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.
@@ -370,17 +433,17 @@ r! /tmp/.X[0-9]*-lock
L lines.
Optionally, if prefixed with
- ~ the access mode is masked
+ ~, 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
+ file has all executable bits unset, 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
+ access mode, too. Similarly, 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
+ addition, the sticky/SUID/SGID bit is removed unless
applied to a directory. This
functionality is particularly useful in
conjunction with Z.
@@ -463,7 +526,7 @@ r! /tmp/.X[0-9]*-lock
and w may be used to
specify a short string that is written to the
file, suffixed by a newline. For
- C specifies the source file
+ C, specifies the source file
or directory. Ignored for all other
lines.