projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix wdt cloexec bug
[project/procd.git]
/
watchdog.c
diff --git
a/watchdog.c
b/watchdog.c
index
e4b82f5
..
dc54308
100644
(file)
--- a/
watchdog.c
+++ b/
watchdog.c
@@
-101,12
+101,14
@@
void watchdog_init(void)
DEBUG(1, "Watchdog handover: fd=%s\n", env);
wdt_fd = atoi(env);
unsetenv("WDTFD");
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;
- 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);