morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

core: close watchdog device if watchdog device is unspecified now

Browse Source 
If a watchdog device was specified previously, and unspecified later and
PID1 is reloaded, then we need to close the device.
This commit is contained in:
Yu Watanabe
2022-06-22 16:22:39 +09:00
parent e83c4d178b
commit 82d7a151db
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/main.c
View File

@@ -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;