service: Implement 'on-watchdog' restart option

[elogind.git] / man / systemd.service.xml

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index abe3a8d673ac771a7824d7d0d423d4fa3f0d5adb..1eb5f39628b3e21f58d374da6282b8b7003c806b 100644 (file)
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -73,9 +73,12 @@
                 <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                 which define the execution environment the commands
                 are executed in, and in
-                <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                 which define the way the processes of the service are
-                terminated.</para>
+                terminated, and in
+                <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                which configure control group settings for the
+                processes of the service.</para>
 
                 <para>Unless <varname>DefaultDependencies=</varname>
                 is set to <option>false</option>, service units will
@@ -214,7 +217,11 @@
                                 systemd. If
                                 <varname>NotifyAccess=</varname> is
                                 not set, it will be implicitly set to
-                                <option>main</option>.</para>
+                                <option>main</option>. Note that
+                                currently
+                                <varname>Type=</varname><option>notify</option>
+                                won't work if used in combination with
+                                <varname>PrivateNetwork=</varname><option>yes</option>.</para>
 
                                 <para>Behavior of
                                 <option>idle</option> is very similar
@@ -480,7 +487,7 @@
                                 was stopped. This includes cases where
                                 the commands configured in
                                 <varname>ExecStop=</varname> were used,
-                                where the service doesn't have any
+                                where the service does not have any
                                 <varname>ExecStop=</varname> defined, or
                                 where the service exited unexpectedly. This
                                 argument takes multiple command lines,
@@ -611,6 +618,7 @@
                                 <option>no</option>,
                                 <option>on-success</option>,
                                 <option>on-failure</option>,
+                                <option>on-watchdog</option>,
                                 <option>on-abort</option>, or
                                 <option>always</option>. If set to
                                 <option>no</option> (the default) the
@@ -637,6 +645,10 @@
                                 signal not specified as a clean exit
                                 status.
                                 If set to
+                                <option>on-watchdog</option> the service
+                                will be restarted only if the watchdog
+                                timeout for the service expires.
+                                If set to
                                 <option>always</option> the service
                                 will be restarted regardless whether
                                 it exited cleanly or not, got
@@ -820,7 +832,7 @@
                                 in other words: the
                                 <varname>Service=</varname> setting of
                                 <filename>.socket</filename> units
-                                doesn't have to match the inverse of
+                                does not have to match the inverse of
                                 the <varname>Sockets=</varname>
                                 setting of the
                                 <filename>.service</filename> it
@@ -994,6 +1006,7 @@
                           <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemd.cgroup</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry>
                   </para>