X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.unit.xml;h=4dc427c305bcd5e9a7bae1e241d1eba9437728eb;hb=07504d6b152084040e48f7657b0f56f364003334;hp=d61426a8454be353561054d80b0d3c53f6b2963b;hpb=79640424059328268b9fb6c5fa8eb777b27a177e;p=elogind.git
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index d61426a84..4dc427c30 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -656,6 +656,37 @@
settings.
+
+ JoinsNamespaceOf=
+
+ For units that start
+ processes (such as service units),
+ lists one or more other units whose
+ network and/or temporary file
+ namespace to join. This only applies
+ to unit types which support the
+ PrivateNetwork= and
+ PrivateTmp=
+ directives (see
+ systemd.exec5
+ for details). If a unit that has this
+ setting set is started its processes
+ will see the same
+ /tmp,
+ /tmp/var and
+ network namespace as one listed unit
+ that is started. If multiple listed
+ units are already started it is not
+ defined which namespace is
+ joined. Note that this setting only
+ has an effect if
+ PrivateNetwork=
+ and/or PrivateTmp=
+ is enabled for both the unit that
+ joins the namespace and the unit whose
+ namespace is joined.
+
+
RequiresMountsFor=
@@ -669,19 +700,29 @@
- OnFailureIsolate=
-
- Takes a boolean
- argument. If , the
- unit listed in
+ OnFailureJobMode=
+
+ Takes a value of
+ fail,
+ replace,
+ replace-irreversibly,
+ isolate,
+ flush,
+ ignore-dependencies
+ or
+ ignore-requirements. Defaults
+ to
+ replace. Specifies
+ how the units listed in
OnFailure= will be
- enqueued in isolation mode, i.e. all
- units that are not its dependency will
- be stopped. If this is set, only a
+ enqueued. See
+ systemctl1's
+ option
+ for details on the possible values. If
+ this is set to
+ isolate, only a
single unit may be listed in
- OnFailure=. Defaults
- to
- .
+ OnFailure=..
@@ -1236,12 +1277,15 @@
%rRoot control group path where units are placed.
- For system instances this usually resolves to /system, except in containers, where the path might be prefixed with the container's root control group.
+ For system instances, this usually resolves to /system, except in containers, where the path might be prefixed with the container's root control group.%RParent directory of the control group path where units are placed.
- For system instances this usually resolves to /, except in containers, where this resolves to the container's root directory. This specifier is particularly useful in the ControlGroup= setting (see systemd.exec5).
+ For system instances, this usually
+ resolves to /, except in
+ containers, where this resolves to the
+ container's root directory.%t