make procd wait for ubus to come up

[project/procd.git] / state.c

diff --git a/state.c b/state.c
index bba5966..41e4471 100644 (file)
--- a/state.c
+++ b/state.c
@@ -15,6 +15,8 @@
 #include <sys/reboot.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <signal.h>
 
 #include "procd.h"
 #include "syslog.h"
@@ -25,6 +27,7 @@
 enum {
        STATE_NONE = 0,
        STATE_EARLY,
+       STATE_UBUS,
        STATE_INIT,
        STATE_RUNNING,
        STATE_SHUTDOWN,
@@ -47,16 +50,17 @@ static void state_enter(void)
                procd_coldplug();
                break;
 
-       case STATE_INIT:
+       case STATE_UBUS:
                // 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);
+               break;
 
+       case STATE_INIT:
+               LOG("- init -\n");
                procd_inittab();
                procd_inittab_run("respawn");
                procd_inittab_run("askconsole");
@@ -75,8 +79,32 @@ static void state_enter(void)
                break;
 
        case STATE_HALT:
-               LOG("- reboot -\n");
-               reboot(reboot_event);
+               LOG("- SIGTERM processes -\n");
+               kill(-1, SIGTERM);
+               sync();
+               sleep(1);
+               LOG("- SIGKILL processes -\n");
+               kill(-1, SIGKILL);
+               sync();
+               sleep(1);
+               if (reboot_event == RB_POWER_OFF)
+                       LOG("- power down -\n");
+               else
+                       LOG("- reboot -\n");
+
+               /* Allow time for last message to reach serial console, etc */
+               sleep(1);
+
+               /* We have to fork here, since the kernel calls do_exit(EXIT_SUCCESS)
+                * in linux/kernel/sys.c, which can cause the machine to panic when
+                * the init process exits... */
+               if (!vfork( )) { /* child */
+                       reboot(reboot_event);
+                       _exit(EXIT_SUCCESS);
+               }
+
+               while (1)
+                       sleep(1);
                break;
 
        default:
@@ -92,6 +120,12 @@ void procd_state_next(void)
        state_enter();
 }
 
+void procd_state_ubus_connect(void)
+{
+       if (state == STATE_UBUS)
+               procd_state_next();
+}
+
 void procd_shutdown(int event)
 {
        if (state >= STATE_SHUTDOWN)