diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-04-25 06:16:37 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-04-25 06:16:37 +0000 |
| commit | 6fb5f01c0b901e53c0e2cf794aa239b375a7466b (patch) | |
| tree | 31851bb0d79a737e12643e312c16d8d737d1839b /miscutils | |
| parent | 26cf2831d75db1be2241c0a4573ddf4da18b5560 (diff) | |
| download | busybox-w32-6fb5f01c0b901e53c0e2cf794aa239b375a7466b.tar.gz busybox-w32-6fb5f01c0b901e53c0e2cf794aa239b375a7466b.tar.bz2 busybox-w32-6fb5f01c0b901e53c0e2cf794aa239b375a7466b.zip | |
we need to daemonize *before* opening the watchdog device
Diffstat (limited to 'miscutils')
| -rw-r--r-- | miscutils/watchdog.c | 13 |
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) | |||
| 45 | opt_complementary = "=1"; /* must have exactly 1 argument */ | 45 | opt_complementary = "=1"; /* must have exactly 1 argument */ |
| 46 | opts = getopt32(argv, "Ft:T:", &st_arg, &ht_arg); | 46 | opts = getopt32(argv, "Ft:T:", &st_arg, &ht_arg); |
| 47 | 47 | ||
| 48 | /* We need to daemonize *before* opening the watchdog as many drivers | ||
| 49 | * will only allow one process at a time to do so. Since daemonizing | ||
| 50 | * is not perfect (child may run before parent finishes exiting), we | ||
| 51 | * can't rely on parent exiting before us (let alone *cleanly* releasing | ||
| 52 | * the watchdog fd -- something else that may not even be allowed). | ||
| 53 | */ | ||
| 54 | if (!(opts & OPT_FOREGROUND)) | ||
| 55 | bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv); | ||
| 56 | |||
| 48 | if (opts & OPT_HTIMER) | 57 | if (opts & OPT_HTIMER) |
| 49 | htimer_duration = xatou_sfx(ht_arg, suffixes); | 58 | htimer_duration = xatou_sfx(ht_arg, suffixes); |
| 50 | stimer_duration = htimer_duration / 2; | 59 | stimer_duration = htimer_duration / 2; |
| @@ -76,10 +85,6 @@ int watchdog_main(int argc, char **argv) | |||
| 76 | stimer_duration, htimer_duration * 1000); | 85 | stimer_duration, htimer_duration * 1000); |
| 77 | #endif | 86 | #endif |
| 78 | 87 | ||
| 79 | if (!(opts & OPT_FOREGROUND)) { | ||
| 80 | bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv); | ||
| 81 | } | ||
| 82 | |||
| 83 | while (1) { | 88 | while (1) { |
| 84 | /* | 89 | /* |
| 85 | * Make sure we clear the counter before sleeping, | 90 | * Make sure we clear the counter before sleeping, |