X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=803eff24aa691e918e0e74939ac758222d286ca3;hb=ef7b6c0190fefaacf6d8f8e1a6dda4ba8b98091b;hp=c8d9300d955dd2ef6053a0ab0b362cc962128d6b;hpb=96ddbf819a5675dba23ffadc35099462fdb2579f;p=elogind.git
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index c8d9300d9..803eff24a 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -73,6 +73,7 @@
$XDG_CONFIG_HOME/systemd/user/*$HOME/.config/systemd/user/*/etc/systemd/user/*
+$XDG_RUNTIME_DIR/systemd/user/*/run/systemd/user/*$XDG_DATA_HOME/systemd/user/*$HOME/.local/share/systemd/user/*
@@ -180,10 +181,10 @@
foo.service.wants/ may exist. All
unit files symlinked from such a directory are
implicitly added as dependencies of type
- Wanted= to the unit. This is useful
+ Wants= to the unit. This is useful
to hook units into the start-up of other units,
without having to modify their unit files. For details
- about the semantics of Wanted=, see
+ about the semantics of Wants=, see
below. The preferred way to create symlinks in the
.wants/ directory of a unit file
is with the enable command of the
@@ -226,7 +227,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.
@@ -343,6 +344,10 @@
/etc/systemd/userLocal configuration
+
+ $XDG_RUNTIME_DIR/systemd/user
+ Runtime units (only used when $XDG_RUNTIME_DIR is set)
+ /run/systemd/userRuntime units
@@ -883,20 +888,22 @@
JobTimeoutSec=
-
- When clients are
- waiting for a job of this unit to
- complete, time out after the specified
- time. If this time limit is reached,
- the job will be cancelled, the unit
- however will not change state or even
- enter the failed
- mode. This value defaults to 0 (job
- timeouts disabled), except for device
+ JobTimeoutAction=
+ JobTimeoutRebootArgument=
+
+ When a job for this
+ unit is queued a time-out may be
+ configured. If this time limit is
+ reached, the job will be cancelled,
+ the unit however will not change state
+ or even enter the
+ failed mode. This
+ value defaults to 0 (job timeouts
+ disabled), except for device
units. NB: this timeout is independent
from any unit-specific timeout (for
example, the timeout set with
- Timeout= in service
+ StartTimeoutSec= in service
units) as the job timeout has no
effect on the unit itself, only on the
job that might be pending for it. Or
@@ -906,7 +913,22 @@
timeout set with this option however
is useful to abort only the job
waiting for the unit state to
- change.
+ change.
+
+ JobTimeoutAction=
+ optionally configures an additional
+ action to take when the time-out is
+ hit. It takes the same values as the
+ per-service
+ StartLimitAction=
+ setting, see
+ systemd.service5
+ for details. Defaults to
+ . JobTimeoutRebootArgument=
+ configures an optional reboot string
+ to pass to the
+ reboot2
+ system call.
@@ -1013,13 +1035,17 @@
openvz,
lxc,
lxc-libvirt,
- systemd-nspawn to
- test against a specific
- implementation. If multiple
- virtualization technologies are nested,
- only the innermost is considered. The
- test may be negated by prepending an
- exclamation mark.
+ systemd-nspawn,
+ docker to test
+ against a specific implementation. See
+ systemd-detect-virt1
+ for a full list of known
+ virtualization technologies and their
+ identifiers. If multiple
+ virtualization technologies are
+ nested, only the innermost is
+ considered. The test may be negated by
+ prepending an exclamation mark.
ConditionHost=
may be used to match against the
@@ -1256,9 +1282,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
@@ -1270,7 +1297,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)
@@ -1503,7 +1530,7 @@
See Alsosystemd1,
- systemctl8,
+ systemctl1,
systemd.special7,
systemd.service5,
systemd.socket5,