fix up watchdog init code

Signed-off-by: John Crispin <blogic@openwrt.org>

diff --git a/state.c b/state.c
index cf0c81d2c6f19e263eef3ae2a890684c19ead771..71890a26847024091c116a399e9d6e09c1bbc5fa 100644 (file)
--- a/state.c
+++ b/state.c
@@ -46,6 +46,9 @@ static void state_enter(void)
                break;
 
        case STATE_INIT:
+               // check if the wdt appeared during coldplug
+               if (!watchdog_fd())
+                       watchdog_init();
                LOG("- init -\n");
                log_init();
                procd_connect_ubus();

diff --git a/watchdog.c b/watchdog.c
index 2a516b4c5e0271489cd4f0f79763165e71aafb44..e4b82f5a8fc2526b8b14954251ca3f3a4892a61d 100644 (file)
--- a/watchdog.c
+++ b/watchdog.c
@@ -95,20 +95,19 @@ void watchdog_init(void)
 {
        char *env = getenv("WDTFD");
 
+
        wdt_timeout.cb = watchdog_timeout_cb;
        if (env) {
-               LOG("- watchdog -\n");
                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);
-               if (getpid() != 1)
-                       fcntl(wdt_fd, F_SETFD, fcntl(wdt_fd, F_GETFD) | FD_CLOEXEC);
        }
        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);