core: rename ShutdownWatchdogSec to RebootWatchdogSec

This option is only used on reboot, not on other types of shutdown
modes, so it is misleading.
Keep the old name working for backward compatibility, but remove it
from the documentation.

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 4dd4bf0ca8b17dc6b34961ad91107db9696e0e3a..e403fa53086f5a5c3947554261380cabaa307145 100644 (file)
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -127,7 +127,7 @@
 
       <varlistentry>
         <term><varname>RuntimeWatchdogSec=</varname></term>
-        <term><varname>ShutdownWatchdogSec=</varname></term>
+        <term><varname>RebootWatchdogSec=</varname></term>
         <term><varname>KExecWatchdogSec=</varname></term>
 
         <listitem><para>Configure the hardware watchdog at runtime and at reboot. Takes a timeout value in seconds (or
@@ -139,9 +139,9 @@
         system manager will ensure to contact it at least once in half the specified timeout interval. This feature
         requires a hardware watchdog device to be present, as it is commonly the case in embedded and server
         systems. Not all hardware watchdogs allow configuration of all possible reboot timeout values, in which case
-        the closest available timeout is picked. <varname>ShutdownWatchdogSec=</varname> may be used to configure the
+        the closest available timeout is picked. <varname>RebootWatchdogSec=</varname> may be used to configure the
         hardware watchdog when the system is asked to reboot. It works as a safety net to ensure that the reboot takes
-        place even if a clean reboot attempt times out. Note that the <varname>ShutdownWatchdogSec=</varname> timeout
+        place even if a clean reboot attempt times out. Note that the <varname>RebootWatchdogSec=</varname> timeout
         applies only to the second phase of the reboot, i.e. after all regular services are already terminated, and
         after the system and service manager process (PID 1) got replaced by the <filename>systemd-shutdown</filename>
         binary, see system <citerefentry><refentrytitle>bootup</refentrytitle><manvolnum>7</manvolnum></citerefentry>
@@ -149,7 +149,7 @@
         and hence <varname>RuntimeWatchdogSec=</varname> is still honoured. In order to define a timeout on this first
         phase of system shutdown, configure <varname>JobTimeoutSec=</varname> and <varname>JobTimeoutAction=</varname>
         in the <literal>[Unit]</literal> section of the <filename>shutdown.target</filename> unit. By default
-        <varname>RuntimeWatchdogSec=</varname> defaults to 0 (off), and <varname>ShutdownWatchdogSec=</varname> to
+        <varname>RuntimeWatchdogSec=</varname> defaults to 0 (off), and <varname>RebootWatchdogSec=</varname> to
         10min. <varname>KExecWatchdogSec=</varname> may be used to additionally enable the watchdog when kexec
         is being executed rather than when rebooting. Note that if the kernel does not reset the watchdog on kexec (depending
         on the specific hardware and/or driver), in this case the watchdog might not get disabled after kexec succeeds

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index e70c1e132a7f1007b91c33ad64bf7d302ed9a99f..035011e34f9bd23f29b55f1db0f56e8a187a54c9 100644 (file)
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -2409,7 +2409,9 @@ const sd_bus_vtable bus_manager_vtable[] = {
         SD_BUS_PROPERTY("DefaultStandardOutput", "s", bus_property_get_exec_output, offsetof(Manager, default_std_output), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("DefaultStandardError", "s", bus_property_get_exec_output, offsetof(Manager, default_std_output), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_WRITABLE_PROPERTY("RuntimeWatchdogUSec", "t", bus_property_get_usec, property_set_runtime_watchdog, offsetof(Manager, runtime_watchdog), 0),
-        SD_BUS_WRITABLE_PROPERTY("ShutdownWatchdogUSec", "t", bus_property_get_usec, bus_property_set_usec, offsetof(Manager, shutdown_watchdog), 0),
+        SD_BUS_WRITABLE_PROPERTY("RebootWatchdogUSec", "t", bus_property_get_usec, bus_property_set_usec, offsetof(Manager, reboot_watchdog), 0),
+        /* The following item is an obsolete alias */
+        SD_BUS_WRITABLE_PROPERTY("ShutdownWatchdogUSec", "t", bus_property_get_usec, bus_property_set_usec, offsetof(Manager, reboot_watchdog), SD_BUS_VTABLE_HIDDEN),
         SD_BUS_WRITABLE_PROPERTY("KExecWatchdogUSec", "t", bus_property_get_usec, bus_property_set_usec, offsetof(Manager, kexec_watchdog), 0),
         SD_BUS_WRITABLE_PROPERTY("ServiceWatchdogs", "b", bus_property_get_bool, bus_property_set_bool, offsetof(Manager, service_watchdogs), 0),
         SD_BUS_PROPERTY("ControlGroup", "s", NULL, offsetof(Manager, cgroup_root), 0),

diff --git a/src/core/main.c b/src/core/main.c
index ccfa22c814d1403f0834376ad785f6a79ef841df..187513bffe82377306c085dfb3fabd912cf4c3d2 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -121,7 +121,7 @@ static bool arg_default_timeout_abort_set;
 static usec_t arg_default_start_limit_interval;
 static unsigned arg_default_start_limit_burst;
 static usec_t arg_runtime_watchdog;
-static usec_t arg_shutdown_watchdog;
+static usec_t arg_reboot_watchdog;
 static usec_t arg_kexec_watchdog;
 static char *arg_early_core_pattern;
 static char *arg_watchdog_device;
@@ -555,7 +555,8 @@ static int parse_config_file(void) {
                 { "Manager", "NUMAMask",                     config_parse_numa_mask,          0, &arg_numa_policy                       },
                 { "Manager", "JoinControllers",              config_parse_warn_compat,        DISABLED_CONFIGURATION, NULL              },
                 { "Manager", "RuntimeWatchdogSec",           config_parse_sec,                0, &arg_runtime_watchdog                  },
-                { "Manager", "ShutdownWatchdogSec",          config_parse_sec,                0, &arg_shutdown_watchdog                 },
+                { "Manager", "RebootWatchdogSec",            config_parse_sec,                0, &arg_reboot_watchdog                   },
+                { "Manager", "ShutdownWatchdogSec",          config_parse_sec,                0, &arg_reboot_watchdog                   }, /* obsolete alias */
                 { "Manager", "KExecWatchdogSec",             config_parse_sec,                0, &arg_kexec_watchdog                    },
                 { "Manager", "WatchdogDevice",               config_parse_path,               0, &arg_watchdog_device                   },
                 { "Manager", "CapabilityBoundingSet",        config_parse_capability_set,     0, &arg_capability_bounding_set           },
@@ -675,7 +676,7 @@ static void set_manager_settings(Manager *m) {
         m->confirm_spawn = arg_confirm_spawn;
         m->service_watchdogs = arg_service_watchdogs;
         m->runtime_watchdog = arg_runtime_watchdog;
-        m->shutdown_watchdog = arg_shutdown_watchdog;
+        m->reboot_watchdog = arg_reboot_watchdog;
         m->kexec_watchdog = arg_kexec_watchdog;
         m->cad_burst_action = arg_cad_burst_action;
 
@@ -1401,7 +1402,7 @@ static int become_shutdown(
         assert(pos < ELEMENTSOF(command_line));
 
         if (streq(shutdown_verb, "reboot"))
-                watchdog_timer = arg_shutdown_watchdog;
+                watchdog_timer = arg_reboot_watchdog;
         else if (streq(shutdown_verb, "kexec"))
                 watchdog_timer = arg_kexec_watchdog;
 
@@ -2106,7 +2107,7 @@ static void reset_arguments(void) {
         arg_default_start_limit_interval = DEFAULT_START_LIMIT_INTERVAL;
         arg_default_start_limit_burst = DEFAULT_START_LIMIT_BURST;
         arg_runtime_watchdog = 0;
-        arg_shutdown_watchdog = 10 * USEC_PER_MINUTE;
+        arg_reboot_watchdog = 10 * USEC_PER_MINUTE;
         arg_kexec_watchdog = 0;
         arg_early_core_pattern = NULL;
         arg_watchdog_device = NULL;
@@ -2646,7 +2647,7 @@ finish:
         pager_close();
 
         if (m) {
-                arg_shutdown_watchdog = m->shutdown_watchdog;
+                arg_reboot_watchdog = m->reboot_watchdog;
                 arg_kexec_watchdog = m->kexec_watchdog;
                 m = manager_free(m);
         }

diff --git a/src/core/manager.h b/src/core/manager.h
index 9600ab5144629564c745b7a4071d1ebf829672e1..a40626e6162647daedc4e75ca1457681c4288677 100644 (file)
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -228,7 +228,7 @@ struct Manager {
         char **client_environment;     /* Environment variables created by clients through the bus API */
 
         usec_t runtime_watchdog;
-        usec_t shutdown_watchdog;
+        usec_t reboot_watchdog;
         usec_t kexec_watchdog;
 
         dual_timestamp timestamps[_MANAGER_TIMESTAMP_MAX];

diff --git a/src/core/system.conf.in b/src/core/system.conf.in
index af6e5d9f62ae237d446de70caf32696b3a15f118..8112125468a5b9d411ed7e0447bb3b35f3e7e70a 100644 (file)
--- a/src/core/system.conf.in
+++ b/src/core/system.conf.in
@@ -26,6 +26,7 @@
 #NUMAPolicy=default
 #NUMAMask=
 #RuntimeWatchdogSec=0
+#RebootWatchdogSec=10min
 #ShutdownWatchdogSec=10min
 #KExecWatchdogSec=0
 #WatchdogDevice=

diff --git a/test/fuzz/fuzz-unit-file/directives.service b/test/fuzz/fuzz-unit-file/directives.service
index d19610fc55c471c2ce53678276b9196b28466d58..fe9d451b41afdc19572cc6ed01eed74b3ede3b7e 100644 (file)
--- a/test/fuzz/fuzz-unit-file/directives.service
+++ b/test/fuzz/fuzz-unit-file/directives.service
@@ -702,6 +702,7 @@ LogLocation=
 LogTarget=
 RuntimeWatchdogSec=
 ShowStatus=
+RebootWatchdogSec=
 ShutdownWatchdogSec=
 KExecWatchdogSec=
 SuspendMode=