From d420282b28f50720e233ccb1c02547c562195653 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 26 Nov 2013 01:39:53 +0100
Subject: core: replace OnFailureIsolate= setting by a more generic
 OnFailureJobMode= setting and make use of it where applicable

---
 man/systemd.unit.xml | 40 +++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

(limited to 'man/systemd.unit.xml')

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index baf44ad2eb..b43fa1369e 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -669,19 +669,37 @@
                         </varlistentry>
 
                         <varlistentry>
-                                <term><varname>OnFailureIsolate=</varname></term>
-
-                                <listitem><para>Takes a boolean
-                                argument. If <option>true</option>, the
-                                unit listed in
+                                <term><varname>OnFailureJobMode=</varname></term>
+
+                                <listitem><para>Takes a value of
+                                <literal>fail</literal>,
+                                <literal>replace</literal>,
+                                <literal>replace-irreversibly</literal>
+                                or
+                                <literal>isolate</literal>. Defaults
+                                to
+                                <literal>replace</literal>. Specifies
+                                how the units listed in
                                 <varname>OnFailure=</varname> 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. If set to
+                                <literal>fail</literal> and
+                                contradicting jobs are already queued,
+                                cause the activation to fail. If set
+                                to <literal>replace</literal> and
+                                contradicting jobs area already
+                                queued, replace
+                                those. <literal>replace-irreversibly</literal>
+                                is similar to
+                                <literal>replace</literal>, however,
+                                creates jobs that cannot be reversed
+                                unless they finished or are explicitly
+                                canceled. <literal>isolate</literal>
+                                may be used to terminate all other
+                                units but the specified one. If
+                                this is set to
+                                <literal>isolate</literal>, only a
                                 single unit may be listed in
-                                <varname>OnFailure=</varname>. Defaults
-                                to
-                                <option>false</option>.</para></listitem>
+                                <varname>OnFailure=</varname>..</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
-- 
cgit v1.2.3-54-g00ecf