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=5e0b5383412d7ef26b3e7be68f7ba62222d65096;hb=80877656a557231f8187f7bc371fd4cb3b70de5a;hpb=2f3b873a49734f8ecc8d929612d33153acbda891
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 5e0b53834..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
@@ -175,7 +175,7 @@ L /tmp/foobar - - - - /dev/null
exist yet. If suffixed with
+ and a
file already exists where the
- pipe is to be created it will
+ pipe is to be created, it will
be removed and be replaced by
the pipe.
@@ -188,7 +188,7 @@ L /tmp/foobar - - - - /dev/null
yet. If suffixed with
+ and a
file already exists where the
- symlink is to be created it
+ symlink is to be created, it
will be removed and be
replaced by the
symlink. If the argument is omitted,
@@ -207,10 +207,15 @@ L /tmp/foobar - - - - /dev/null
suffixed with
+ and a
file already exists where the
- device node is to be created
+ device node is to be created,
it will be removed and be
replaced by the device
- node.
+ 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.
+
@@ -221,10 +226,15 @@ L /tmp/foobar - - - - /dev/null
exist yet. If suffixed with
+ and a
file already exists where the
- device node is to be created
+ device node is to be created,
it will be removed and be
replaced by the device
- node.
+ 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.
+
@@ -232,12 +242,12 @@ L /tmp/foobar - - - - /dev/null
Recursively
copy a file or directory, if
the destination files or
- directories don't exist
+ directories do not exist
yet. Note that this command
will not descend into
subdirectories if the
destination directory already
- exists, instead the entire
+ exists. Instead, the entire
copy operation is
skipped. If the argument is omitted,
files from the source directory
@@ -423,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.
@@ -516,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.