the cloexec logic of the watchdog was broken

[project/procd.git] / state.c

diff --git a/state.c b/state.c
index 8fe931e..9cde905 100644 (file)
--- a/state.c
+++ b/state.c
@@ -40,16 +40,19 @@ static void state_enter(void)
        switch (state) {
        case STATE_EARLY:
                LOG("- early -\n");
-               watchdog_init();
+               watchdog_init(0);
                hotplug("/etc/hotplug.json");
                procd_coldplug();
                break;
 
        case STATE_INIT:
+               // try to reopen incase the wdt was not available before coldplug
+               watchdog_init(0);
                LOG("- init -\n");
                log_init();
                procd_connect_ubus();
                procd_inittab();
+               procd_inittab_run("respawn");
                procd_inittab_run("askconsole");
                procd_inittab_run("askfirst");
                procd_inittab_run("sysinit");
@@ -62,12 +65,11 @@ static void state_enter(void)
        case STATE_SHUTDOWN:
                LOG("- shutdown -\n");
                procd_inittab_run("shutdown");
+               sync();
                break;
 
        case STATE_HALT:
                LOG("- reboot -\n");
-               sync();
-               sleep(1);
                reboot(reboot_event);
                break;