X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=2e298ca04f06caaa6318735a288c1bb4512eca9e;hp=ec7ca5634e78fe7a8307754ff0e329a8d5333ff2;hb=d55192add75584f55932ad463ee6b4cc30370c63;hpb=aa08982d62cf45b59ea6a06c915391f5db1fb86e
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index ec7ca5634..2e298ca04 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -181,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
@@ -211,6 +211,10 @@
template .d/ subdirectory and reads
its .conf files.
+
+
Note that while systemd offers a flexible
dependency system between units it is recommended to
use this functionality only sparingly and instead rely
@@ -888,20 +892,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
@@ -911,7 +917,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.
@@ -933,7 +954,11 @@
ConditionDirectoryNotEmpty=ConditionFileNotEmpty=ConditionFileIsExecutable=
- ConditionNull=
+
+
Before starting a unit
verify that the specified condition is
@@ -1018,13 +1043,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
@@ -1059,14 +1088,15 @@
ConditionSecurity=
may be used to check whether the given
security module is enabled on the
- system. Currently the recognized values
- values are selinux,
+ system. Currently the recognized
+ values values are
+ selinux,
apparmor,
- ima and
- smack.
- The test may be negated by prepending
- an exclamation
- mark.
+ ima,
+ smack and
+ audit. The test may
+ be negated by prepending an
+ exclamation mark.ConditionCapability=
may be used to check whether the given
@@ -1208,15 +1238,6 @@
exists, is a regular file and marked
executable.
- Finally,
- ConditionNull= may
- be used to add a constant condition
- check value to the unit. It takes a
- boolean argument. If set to
- false, the condition
- will always fail, otherwise
- succeed.
-
If multiple conditions are
specified, the unit will be executed if
all of them apply (i.e. a logical AND
@@ -1242,6 +1263,38 @@
have no effect.
+
+ AssertArchitecture=
+ AssertVirtualization=
+ AssertHost=
+ AssertKernelCommandLine=
+ AssertSecurity=
+ AssertCapability=
+ AssertACPower=
+ AssertNeedsUpdate=
+ AssertFirstBoot=
+ AssertPathExists=
+ AssertPathExistsGlob=
+ AssertPathIsDirectory=
+ AssertPathIsSymbolicLink=
+ AssertPathIsMountPoint=
+ AssertPathIsReadWrite=
+ AssertDirectoryNotEmpty=
+ AssertFileNotEmpty=
+ AssertFileIsExecutable=
+
+ Similar to the
+ ConditionArchitecture=,
+ ConditionVirtualization=,
+ ... condition settings described above
+ these settings add assertion checks to
+ the start-up of the unit. However,
+ unlike the conditions settings any
+ assertion setting that is not met
+ results in failure of the start
+ job it was triggered by.
+
+
SourcePath=A path to a