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

Merge pull request #23802 from yuwata/core-watchdog-follow-ups

Browse Source 
core: cleanups for watchdog
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2022-06-23 09:59:24 +02:00
committed by GitHub
parent 6b16539879 82d7a151db
commit ef88c81bbe
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
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;
@@ -3007,7 +3005,6 @@ finish:
/* Cleanup watchdog_device strings for valgrind. We need them
* in become_shutdown() so normally we cannot free them yet. */
watchdog_free_device();
arg_watchdog_device = mfree(arg_watchdog_device);
reset_arguments();
return retval;
}