Fix procd not handling rapid reboot signals very well

[project/procd.git] / state.c

diff --git a/state.c b/state.c
index 1abcbca..bba5966 100644 (file)
--- a/state.c
+++ b/state.c
@@ -18,8 +18,9 @@
 
 #include "procd.h"
 #include "syslog.h"
-#include "hotplug.h"
+#include "plug/hotplug.h"
 #include "watchdog.h"
+#include "service/service.h"
 
 enum {
        STATE_NONE = 0,
@@ -36,20 +37,28 @@ static int reboot_event;
 
 static void state_enter(void)
 {
+       char ubus_cmd[] = "/sbin/ubusd";
 
        switch (state) {
        case STATE_EARLY:
                LOG("- early -\n");
-               watchdog_init();
+               watchdog_init(0);
                hotplug("/etc/hotplug.json");
                procd_coldplug();
                break;
 
        case STATE_INIT:
-               LOG("- init -\n");
-               log_init();
+               // try to reopen incase the wdt was not available before coldplug
+               watchdog_init(0);
+               LOG("- ubus -\n");
                procd_connect_ubus();
+
+               LOG("- init -\n");
+               service_init();
+               service_start_early("ubus", ubus_cmd);
+
                procd_inittab();
+               procd_inittab_run("respawn");
                procd_inittab_run("askconsole");
                procd_inittab_run("askfirst");
                procd_inittab_run("sysinit");
@@ -62,12 +71,11 @@ static void state_enter(void)
        case STATE_SHUTDOWN:
                LOG("- shutdown -\n");
                procd_inittab_run("shutdown");
+               sync();
                break;
 
        case STATE_HALT:
-               LOG("- reboot -\nprocd says good bye !\n");
-               sync();
-               sleep(1);
+               LOG("- reboot -\n");
                reboot(reboot_event);
                break;
 
@@ -79,14 +87,16 @@ static void state_enter(void)
 
 void procd_state_next(void)
 {
-       DEBUG(2, "Change state %d -> %d\n", state, state + 1);
+       DEBUG(4, "Change state %d -> %d\n", state, state + 1);
        state++;
        state_enter();
 }
 
 void procd_shutdown(int event)
 {
-       DEBUG(1, "Shutting down system with event %x\n", reboot_event);
+       if (state >= STATE_SHUTDOWN)
+               return;
+       DEBUG(2, "Shutting down system with event %x\n", event);
        reboot_event = event;
        state = STATE_SHUTDOWN;
        state_enter();