summaryrefslogtreecommitdiffstats
path: root/man/kernel-command-line.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2021-10-13 13:07:50 +0200
committerLennart Poettering <lennart@poettering.net>2021-10-13 13:10:34 +0200
commit9c5ea4b1432864e8ca40e4c9df61576fd9e18fe3 (patch)
tree546b46ff54092f5531bf149df41e406501fee88a /man/kernel-command-line.xml
parentman: document new "off" setting for systemd-system.conf watchdog settings (diff)
downloadsystemd-9c5ea4b1432864e8ca40e4c9df61576fd9e18fe3.tar.xz
systemd-9c5ea4b1432864e8ca40e4c9df61576fd9e18fe3.zip
man: document new systemd.watchdog_sec= kernel cmdline option
Follow-up for: b3aa73e4de614c06c4a27e5635967a0392654fbc
Diffstat (limited to '')
-rw-r--r--man/kernel-command-line.xml20
1 files changed, 17 insertions, 3 deletions
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index f546a1161a..2093edd05c 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -386,8 +386,9 @@
<term><varname>systemd.default_timeout_start_sec=</varname></term>
<listitem>
- <para>Overwrites the default start job timeout <varname>DefaultTimeoutStartSec=</varname> at boot. For details,
- see <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
+ <para>Overrrides the default start job timeout <varname>DefaultTimeoutStartSec=</varname> at
+ boot. For details, see
+ <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
</listitem>
</varlistentry>
@@ -395,7 +396,20 @@
<term><varname>systemd.watchdog_device=</varname></term>
<listitem>
- <para>Overwrites the watchdog device path <varname>WatchdogDevice=</varname>. For details, see
+ <para>Overrrides 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>systemd.watchdog_sec=</varname></term>
+
+ <listitem>
+ <para>Overrrides the watchdog timeout settings otherwise configured with
+ <varname>RuntimeWatchdog=</varname>, <varname>RebootWatchdog=</varname> and
+ <varname>KExecWatchdogSec=</varname>. Takes a time value (if no unit is specified, seconds is the
+ implicitly assumed time unit) or the special strings <literal>off</literal> or
+ <literal>default</literal>. For details, see
<citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
</listitem>
</varlistentry>