Signed-off-by: John Crispin <blogic@openwrt.org>
+ // check if the wdt appeared during coldplug
+ if (!watchdog_fd())
+ watchdog_init();
LOG("- init -\n");
log_init();
procd_connect_ubus();
LOG("- init -\n");
log_init();
procd_connect_ubus();
{
char *env = getenv("WDTFD");
{
char *env = getenv("WDTFD");
wdt_timeout.cb = watchdog_timeout_cb;
if (env) {
wdt_timeout.cb = watchdog_timeout_cb;
if (env) {
DEBUG(1, "Watchdog handover: fd=%s\n", env);
wdt_fd = atoi(env);
DEBUG(1, "Watchdog handover: fd=%s\n", env);
wdt_fd = atoi(env);
- fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
unsetenv("WDTFD");
} else {
wdt_fd = open("/dev/watchdog", O_WRONLY);
unsetenv("WDTFD");
} else {
wdt_fd = open("/dev/watchdog", O_WRONLY);
- if (getpid() != 1)
- fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
}
if (wdt_fd < 0)
return;
}
if (wdt_fd < 0)
return;
+ fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
+ LOG("- watchdog -\n");
watchdog_timeout(30);
watchdog_timeout_cb(&wdt_timeout);
watchdog_timeout(30);
watchdog_timeout_cb(&wdt_timeout);