From: Edward A. James <eajames@us.ibm.com>
Date: Fri, 8 Dec 2017 17:27:01 +0000 (-0600)
Subject: documentation: add description for watchdog device path
X-Git-Tag: v236~31^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7352%2Fhead;p=thirdparty%2Fsystemd.git

documentation: add description for watchdog device path

Document the command line parameter and the system configuration file
setting.
---

diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index 1864895ee2d..422c0607da0 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -382,6 +382,15 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><varname>systemd.watchdog_device=</varname></term>
+
+        <listitem>
+          <para>Overwrites the watchdog device path <varname>WatchdogDevice=</varname>. For details, see
+          <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><varname>modules_load=</varname></term>
         <term><varname>rd.modules_load=</varname></term>
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 43715813ed3..08f6c91901c 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -161,8 +161,10 @@
         <literal>d</literal>, <literal>w</literal>). If
         <varname>RuntimeWatchdogSec=</varname> is set to a non-zero
         value, the watchdog hardware
-        (<filename>/dev/watchdog</filename>) will be programmed to
-        automatically reboot the system if it is not contacted within
+        (<filename>/dev/watchdog</filename> or the path specified with
+        <varname>WatchdogDevice=</varname> or the kernel option
+        <varname>systemd.watchdog-device=</varname>) will be programmed
+        to automatically reboot the system if it is not contacted within
         the specified timeout interval. The system manager will ensure
         to contact it at least once in half the specified timeout
         interval. This feature requires a hardware watchdog device to
@@ -179,6 +181,15 @@
         available.</para></listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><varname>WatchdogDevice=</varname></term>
+
+        <listitem><para>Configure the hardware watchdog device that the
+        runtime and shutdown watchdog timers will open and use. Defaults
+        to <filename>/dev/watchdog</filename>. This setting has no
+        effect if a hardware watchdog is not available.</para></listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><varname>CapabilityBoundingSet=</varname></term>