X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=67d46eda983efd931f194d73fd1ec62d4350e142;hb=fb7661a6020b5680d5647d3d85b0501a4f3a5042;hp=b1f8108984377dd76e45e62b2dcab985d819efb3;hpb=e26807239bd65bc17535a53cd540f38600e7ef24;p=elogind.git
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index b1f810898..67d46eda9 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -74,6 +74,8 @@
$HOME/.config/systemd/user/*/etc/systemd/user/*/run/systemd/user/*
+$XDG_DATA_HOME/systemd/user/*
+$HOME/.local/share/systemd/user/*/usr/lib/systemd/user/*...
@@ -201,7 +203,12 @@
settings to a unit, without having to modify their
unit files. Make sure that the file that is included
has the appropriate section headers before any
- directive.
+ directive. Note that for instanced units this logic
+ will first look for the instance
+ .d/ subdirectory and read its
+ .conf files, followed by the
+ template .d/ subdirectory and reads
+ its .conf files.
Note that while systemd offers a flexible
dependency system between units it is recommended to
@@ -219,7 +226,7 @@
result is usable as part of a filename. Basically,
given a path, "/" is replaced by "-", and all
unprintable characters and the "-" are replaced by
- C-style "\x20" escapes. The root directory "/" is
+ C-style "\x2d" escapes. The root directory "/" is
encoded as single dash, while otherwise the initial
and ending "/" is removed from all paths during
transformation. This escaping is reversible.
@@ -273,8 +280,10 @@
() and the variable
$SYSTEMD_UNIT_PATH is set, this
contents of this variable overrides the unit load
- path.
-
+ path. If $SYSTEMD_UNIT_PATH ends
+ with an empty component (:), the
+ usual unit load path will be appended to the contents
+ of the variable.
@@ -338,9 +347,17 @@
/run/systemd/userRuntime units
+
+ $XDG_DATA_HOME/systemd/user
+ Units of packages that have been installed in the home directory (only used when $XDG_DATA_HOME is set)
+
+
+ $HOME/.local/share/systemd/user
+ Units of packages that have been installed in the home directory (only used when $XDG_DATA_HOME is not set)
+ /usr/lib/systemd/user
- Units of installed packages
+ Units of packages that have been installed system-wide
@@ -396,7 +413,7 @@
man:. For more
information about the syntax of these
URIs, see
- uri7. The
+ uri7. The
URIs should be listed in order of
relevance, starting with the most
relevant. It is a good idea to first
@@ -986,6 +1003,7 @@
virtualization solution, or one of
qemu,
kvm,
+ zvm,
vmware,
microsoft,
oracle,
@@ -1052,7 +1070,7 @@
(i.e. this does not check whether
capability is actually available in
the permitted or effective sets, see
- capabilities7
+ capabilities7
for details). Pass a capability name
such as CAP_MKNOD,
possibly prefixed with an exclamation
@@ -1238,9 +1256,10 @@
[Install] Section Options
- Unit file may include a [Install] section, which
- carries installation information for the unit. This
- section is not interpreted by
+ Unit file may include an
+ [Install] section, which carries
+ installation information for the unit. This section is
+ not interpreted by
systemd1
during runtime. It is used exclusively by the
enable and
@@ -1252,7 +1271,7 @@
Alias=
- A space-seperated list
+ A space-separated list
of additional names this unit shall be
installed under. The names listed here
must have the same suffix (i.e. type)
@@ -1485,7 +1504,7 @@
See Alsosystemd1,
- systemctl8,
+ systemctl1,
systemd.special7,
systemd.service5,
systemd.socket5,
@@ -1500,7 +1519,8 @@
systemd.scope5,
systemd.slice5,
systemd.time7,
- capabilities7,
+ systemd-verify1,
+ capabilities7,
systemd.directives7,
uname1