From: Jan Klötzke <Jan.Kloetzke@preh.de>
Date: Mon, 20 Mar 2017 12:10:43 +0000 (+0100)
Subject: pid1: add option to disable service watchdogs
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=645c13d2553a301820ea8e065f7e1a3e69a489d1;p=elogind.git

pid1: add option to disable service watchdogs

Add a "systemd.service_watchdogs=" option to the command line which
disables all service runtime watchdogs and emergency actions.
---

diff --git a/man/elogind.xml b/man/elogind.xml
index f1aa13698..274f155e8 100644
--- a/man/elogind.xml
+++ b/man/elogind.xml
@@ -348,9 +348,14 @@
       <varlistentry>
         <term><option>-D</option></term>
         <term><option>--daemon</option></term>
+        <term><option>--service-watchdogs=</option></term>
 
         <listitem><para>Daemonize elogind by double-forking
         into background.</para></listitem>
+        <listitem><para>Globally enable/disable all service watchdog timeouts and emergency
+        actions. This setting may also be specified during boot, on the kernel
+        command line via the <varname>elogind.service_watchdogs=</varname>
+        option, see below. Defaults to enabled.</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -1058,6 +1063,19 @@
         </para></listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><varname>systemd.service_watchdogs=</varname></term>
+
+        <listitem><para>Takes a boolean argument. If disabled, all service runtime
+        watchdogs (<option>WatchdogSec=</option>) and emergency actions (e.g.
+        <option>OnFailure=</option> or <option>StartLimitAction=</option>) are
+        ignored by the system manager (PID 1); see
+        <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+        Defaults to enabled, i.e. watchdogs and failure actions are processed
+        normally. The hardware watchdog is not affected by this
+        option.</para></listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><varname>systemd.show_status</varname></term>