From 82d7a151db3f504fee705bcd0ded2fa0d64eafb2 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 22 Jun 2022 16:22:39 +0900 Subject: [PATCH] core: close watchdog device if watchdog device is unspecified now If a watchdog device was specified previously, and unspecified later and PID1 is reloaded, then we need to close the device. --- src/core/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/core/main.c b/src/core/main.c index b796dc8c2a0..7cd13b9e13e 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -2118,11 +2118,9 @@ static int initialize_runtime( write_container_id(); } - if (arg_watchdog_device) { - r = watchdog_set_device(arg_watchdog_device); - if (r < 0) - log_warning_errno(r, "Failed to set watchdog device to %s, ignoring: %m", arg_watchdog_device); - } + r = watchdog_set_device(arg_watchdog_device); + if (r < 0) + log_warning_errno(r, "Failed to set watchdog device to %s, ignoring: %m", arg_watchdog_device); } else { _cleanup_free_ char *p = NULL; -- 2.47.3