add service_validator support

[project/procd.git] / state.c

diff --git a/state.c b/state.c
index 71890a2..f83032c 100644 (file)
--- a/state.c
+++ b/state.c
@@ -20,6 +20,7 @@
 #include "syslog.h"
 #include "hotplug.h"
 #include "watchdog.h"
 #include "syslog.h"
 #include "hotplug.h"
 #include "watchdog.h"

+#include "service.h"

 
 enum {
        STATE_NONE = 0,
 
 enum {
        STATE_NONE = 0,


@@ -40,18 +41,18 @@ static void state_enter(void)
        switch (state) {
        case STATE_EARLY:
                LOG("- early -\n");
        switch (state) {
        case STATE_EARLY:
                LOG("- early -\n");

-               watchdog_init();
+               watchdog_init(0);

                hotplug("/etc/hotplug.json");
                procd_coldplug();
                break;
 
        case STATE_INIT:
                hotplug("/etc/hotplug.json");
                procd_coldplug();
                break;
 
        case STATE_INIT:

-               // check if the wdt appeared during coldplug
-               if (!watchdog_fd())
-                       watchdog_init();
+               // try to reopen incase the wdt was not available before coldplug
+               watchdog_init(0);

                LOG("- init -\n");
                log_init();
                procd_connect_ubus();
                LOG("- init -\n");
                log_init();
                procd_connect_ubus();

+               service_init();

                procd_inittab();
                procd_inittab_run("respawn");
                procd_inittab_run("askconsole");
                procd_inittab();
                procd_inittab_run("respawn");
                procd_inittab_run("askconsole");


@@ -89,7 +90,7 @@ void procd_state_next(void)
 
 void procd_shutdown(int event)
 {
 
 void procd_shutdown(int event)
 {

-       DEBUG(1, "Shutting down system with event %x\n", reboot_event);
+       DEBUG(1, "Shutting down system with event %x\n", event);

        reboot_event = event;
        state = STATE_SHUTDOWN;
        state_enter();
        reboot_event = event;
        state = STATE_SHUTDOWN;
        state_enter();