X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Ftmpfiles.d.xml;h=20ed803a527653565f0c15dfdc02641d4f76c5df;hb=849958d1ba3533c953fad46d4d41c0ec6e48316d;hp=0da52aedadf32b0f7665cde07d7c51cc9862fa9b;hpb=c4708f132381e4bbc864d5241381b5cde4f54878;p=elogind.git
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index 0da52aeda..20ed803a5 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -61,6 +61,23 @@
temporary files and directories which usually reside
in directories such as /run
or /tmp.
+
+ Volatile and temporary files and directories are
+ those located in /run (and its
+ alias /var/run),
+ /tmp,
+ /var/tmp, the API file systems
+ such as /sys or
+ /proc, as well as some other
+ directories below /var.
+
+ System daemons frequently require private
+ runtime directories below /run to
+ place communication sockets and similar in. For these,
+ consider declaring them in their unit files using
+ RuntimeDirectory=
+ (see systemd.exec5 for details),
+ if this is feasible.
@@ -88,8 +105,8 @@
the local administrator, who may use this logic to
override the configuration files installed by vendor
packages. All configuration files are sorted by their
- filename in lexicographic order, regardless in which
- of the directories they reside. If multiple files
+ 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 logged as errors.
@@ -109,7 +126,6 @@
d /run/user 0755 root root 10d -
L /tmp/foobar - - - - /dev/null
-
Type
@@ -167,6 +183,11 @@ L /tmp/foobar - - - - /dev/null
Create a block device node if it does not exist yet.
+
+ C
+ Recursively copy a file or directory, if the destination files or directories don't exist yet.
+
+
mIf the
@@ -174,7 +195,7 @@ L /tmp/foobar - - - - /dev/null
adjust its access mode, group
and user to the specified
values and reset the SELinux
- label. If it does not exist, do
+ security context. If it does not exist, do
nothing.
@@ -242,7 +263,7 @@ L /tmp/foobar - - - - /dev/null
zRestore
- SELinux security context label
+ SELinux security context
and set ownership and access
mode of a file or directory if
it exists. Lines of this type
@@ -255,7 +276,7 @@ L /tmp/foobar - - - - /dev/null
ZRecursively
restore SELinux security
- context label and set
+ context and set
ownership and access mode of a
path and all its
subdirectories (if it is a
@@ -273,20 +294,18 @@ L /tmp/foobar - - - - /dev/null
execute at any time, e.g. on package upgrades.
systemd-tmpfiles will
execute line with an exclamation mark only if
- option is given.
+ option is given.
For example:
-
-# Make sure these are created by default so that nobody else can
+ # Make sure these are created by default so that nobody else can
d /tmp/.X11-unix 1777 root root 10d
# Unlink the X11 lock files
-r! /tmp/.X[0-9]*-lock
-
+r! /tmp/.X[0-9]*-lock
The second line in contrast to the first one
would break a running system, and will only be
- executed with .
+ executed with .
@@ -432,8 +451,10 @@ r! /tmp/.X[0-9]*-lock
f, F,
and w may be used to
specify a short string that is written to the
- file, suffixed by a newline. Ignored for all
- other lines.
+ file, suffixed by a newline. For
+ C specifies the source file
+ or directory. Ignored for all other
+ lines.
@@ -444,8 +465,8 @@ r! /tmp/.X[0-9]*-lock
/etc/tmpfiles.d/screen.conf examplescreen needs two directories created at boot with specific modes and ownership.
- d /var/run/screens 1777 root root 10d
-d /var/run/uscreens 0755 root root 10d12h
+ d /run/screens 1777 root root 10d
+d /run/uscreens 0755 root root 10d12h/etc/tmpfiles.d/abrt.conf example
@@ -461,7 +482,8 @@ x /var/tmp/abrt/*
systemd1,
systemd-tmpfiles8,
- systemd-delta1
+ systemd-delta1,
+ systemd.exec5