aboutsummaryrefslogtreecommitdiff
path: root/miscutils/watchdog.c
diff options
context:
space:
mode:
authorGravatar Mike Frysinger <vapier@gentoo.org>2009-04-25 06:16:37 +0000
committerGravatar Mike Frysinger <vapier@gentoo.org>2009-04-25 06:16:37 +0000
commit6fb5f01c0b901e53c0e2cf794aa239b375a7466b (patch)
tree31851bb0d79a737e12643e312c16d8d737d1839b /miscutils/watchdog.c
parent26cf2831d75db1be2241c0a4573ddf4da18b5560 (diff)
downloadbusybox-6fb5f01c0b901e53c0e2cf794aa239b375a7466b.tar.gz
busybox-6fb5f01c0b901e53c0e2cf794aa239b375a7466b.tar.bz2
we need to daemonize *before* opening the watchdog device
Diffstat (limited to 'miscutils/watchdog.c')
-rw-r--r--miscutils/watchdog.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 893cef0ac..e334d0189 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -45,6 +45,15 @@ int watchdog_main(int argc, char **argv)
opt_complementary = "=1"; /* must have exactly 1 argument */
opts = getopt32(argv, "Ft:T:", &st_arg, &ht_arg);
+ /* We need to daemonize *before* opening the watchdog as many drivers
+ * will only allow one process at a time to do so. Since daemonizing
+ * is not perfect (child may run before parent finishes exiting), we
+ * can't rely on parent exiting before us (let alone *cleanly* releasing
+ * the watchdog fd -- something else that may not even be allowed).
+ */
+ if (!(opts & OPT_FOREGROUND))
+ bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
+
if (opts & OPT_HTIMER)
htimer_duration = xatou_sfx(ht_arg, suffixes);
stimer_duration = htimer_duration / 2;
@@ -76,10 +85,6 @@ int watchdog_main(int argc, char **argv)
stimer_duration, htimer_duration * 1000);
#endif
- if (!(opts & OPT_FOREGROUND)) {
- bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
- }
-
while (1) {
/*
* Make sure we clear the counter before sleeping,