X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=state.c;h=b9416341440d873b999dadbda8e6b43a0b9a3477;hp=90e883c50c5fb2dee1cd009b098c9247bf76620e;hb=98975d54d405c45edf7bab2205d6ffb75ed90438;hpb=df1b0c3512fe6af3724536b45f07fb86ad166585

diff --git a/state.c b/state.c
index 90e883c..b941634 100644
--- a/state.c
+++ b/state.c
@@ -15,11 +15,14 @@
 #include <sys/reboot.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <signal.h>
 
 #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,6 +39,7 @@ static int reboot_event;
 
 static void state_enter(void)
 {
+	char ubus_cmd[] = "/sbin/ubusd";
 
 	switch (state) {
 	case STATE_EARLY:
@@ -48,9 +52,13 @@ static void state_enter(void)
 	case STATE_INIT:
 		// try to reopen incase the wdt was not available before coldplug
 		watchdog_init(0);
-		LOG("- init -\n");
-		log_init();
+		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");
@@ -69,6 +77,14 @@ static void state_enter(void)
 		break;
 
 	case STATE_HALT:
+		LOG("- SIGTERM processes -\n");
+		kill(-1, SIGTERM);
+		sync();
+		sleep(1);
+		LOG("- SIGKILL processes -\n");
+		kill(-1, SIGKILL);
+		sync();
+		sleep(1);
 		LOG("- reboot -\n");
 		reboot(reboot_event);
 		break;
@@ -81,14 +97,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", event);
+	if (state >= STATE_SHUTDOWN)
+		return;
+	DEBUG(2, "Shutting down system with event %x\n", event);
 	reboot_event = event;
 	state = STATE_SHUTDOWN;
 	state_enter();