projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the cloexec logic of the watchdog was broken
[project/procd.git]
/
watchdog.c
diff --git
a/watchdog.c
b/watchdog.c
index
dc54308
..
d927c53
100644
(file)
--- a/
watchdog.c
+++ b/
watchdog.c
@@
-91,24
+91,28
@@
char* watchdog_fd(void)
return fd_buf;
}
return fd_buf;
}
-void watchdog_init(
void
)
+void watchdog_init(
int preinit
)
{
char *env = getenv("WDTFD");
{
char *env = getenv("WDTFD");
+ if (wdt_fd >= 0)
+ return;
wdt_timeout.cb = watchdog_timeout_cb;
if (env) {
DEBUG(1, "Watchdog handover: fd=%s\n", env);
wdt_fd = atoi(env);
unsetenv("WDTFD");
wdt_timeout.cb = watchdog_timeout_cb;
if (env) {
DEBUG(1, "Watchdog handover: fd=%s\n", env);
wdt_fd = atoi(env);
unsetenv("WDTFD");
- fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
} else {
wdt_fd = open("/dev/watchdog", O_WRONLY);
} else {
wdt_fd = open("/dev/watchdog", O_WRONLY);
- if ((getpid() != 1) && (wdt_fd >= 0))
- fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
}
}
+
if (wdt_fd < 0)
return;
if (wdt_fd < 0)
return;
+
+ if (!preinit)
+ fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
+
LOG("- watchdog -\n");
watchdog_timeout(30);
watchdog_timeout_cb(&wdt_timeout);
LOG("- watchdog -\n");
watchdog_timeout(30);
watchdog_timeout_cb(&wdt_timeout);