From: Ken (Bitsko) MacLeod <mqbitsko+github@gmail.com>
Date: Fri, 15 Dec 2017 10:10:41 +0000 (-0600)
Subject: man: Clarify when OnFailure= activates after restarts (#7646)
X-Git-Tag: v237~216
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd2538b50ba283c9ce39142d5d16d90184a55b90;p=thirdparty%2Fsystemd.git

man: Clarify when OnFailure= activates after restarts (#7646)
---

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 76dfe60be49..b0aee3329f9 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -754,7 +754,8 @@
         limiting configured with <varname>StartLimitIntervalSec=</varname>
         and <varname>StartLimitBurst=</varname>, see
         <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-        for details.</para>
+        for details.  A restarted service enters the failed state only
+        after the start limits are reached.</para>
 
         <para>Setting this to <option>on-failure</option> is the
         recommended choice for long-running services, in order to
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 5cd8be310d6..445c26f3e50 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -665,7 +665,9 @@
 
         <listitem><para>A space-separated list of one or more units
         that are activated when this unit enters the
-        <literal>failed</literal> state.</para></listitem>
+        <literal>failed</literal> state.  A service unit using
+        <varname>Restart=</varname> enters the failed state only after
+        the start limits are reached.</para></listitem>
       </varlistentry>
 
       <varlistentry>
diff --git a/man/systemd.xml b/man/systemd.xml
index 62ececb6e9b..a881b392a7b 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -297,11 +297,12 @@
     states are called "activating", "deactivating"). A special
     "failed" state is available as well, which is very similar to
     "inactive" and is entered when the service failed in some way
-    (process returned error code on exit, or crashed, or an operation
-    timed out). If this state is entered, the cause will be logged,
-    for later reference. Note that the various unit types may have a
-    number of additional substates, which are mapped to the five
-    generalized unit states described here.</para>
+    (process returned error code on exit, or crashed, an operation
+    timed out, or after too many restarts). If this state is entered,
+    the cause will be logged, for later reference. Note that the
+    various unit types may have a number of additional substates,
+    which are mapped to the five generalized unit states described
+    here.</para>
 
     <para>The following unit types are available:</para>