X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=state.c;h=f83032ce9d4c2ad0c7080d7eea9392390409e5b1;hp=71890a26847024091c116a399e9d6e09c1bbc5fa;hb=f9d31edb8938341b9217ee4c14eb58111414eb97;hpb=89eec0d61e15bd3c3cd83d24a17fa5894ae984c1

diff --git a/state.c b/state.c
index 71890a2..f83032c 100644
--- a/state.c
+++ b/state.c
@@ -20,6 +20,7 @@
 #include "syslog.h"
 #include "hotplug.h"
 #include "watchdog.h"
+#include "service.h"
 
 enum {
 	STATE_NONE = 0,
@@ -40,18 +41,18 @@ 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:
-		// 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();
+		service_init();
 		procd_inittab();
 		procd_inittab_run("respawn");
 		procd_inittab_run("askconsole");
@@ -89,7 +90,7 @@ void procd_state_next(void)
 
 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();