X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=inline;f=state.c;h=bba59665167df085bda91337dadb447332b4376d;hb=396a82c551ab02871ec0e6f399941c9379258bdc;hp=71890a26847024091c116a399e9d6e09c1bbc5fa;hpb=89eec0d61e15bd3c3cd83d24a17fa5894ae984c1;p=project%2Fprocd.git

diff --git a/state.c b/state.c
index 71890a2..bba5966 100644
--- 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,22 +37,26 @@ 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:
-		// check if the wdt appeared during coldplug
-		if (!watchdog_fd())
-			watchdog_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");
@@ -82,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();