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

diff --git a/state.c b/state.c
index 71890a2..41e4471 100644
--- a/state.c
+++ b/state.c
@@ -15,15 +15,19 @@
 #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,
 	STATE_EARLY,
+	STATE_UBUS,
 	STATE_INIT,
 	STATE_RUNNING,
 	STATE_SHUTDOWN,
@@ -36,22 +40,27 @@ 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_UBUS:
+		// try to reopen incase the wdt was not available before coldplug
+		watchdog_init(0);
+		LOG("- ubus -\n");
+		procd_connect_ubus();
+		service_init();
+		service_start_early("ubus", ubus_cmd);
+		break;
+
 	case STATE_INIT:
-		// check if the wdt appeared during coldplug
-		if (!watchdog_fd())
-			watchdog_init();
 		LOG("- init -\n");
-		log_init();
-		procd_connect_ubus();
 		procd_inittab();
 		procd_inittab_run("respawn");
 		procd_inittab_run("askconsole");
@@ -70,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:
@@ -82,14 +115,22 @@ 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_state_ubus_connect(void)
+{
+	if (state == STATE_UBUS)
+		procd_state_next();
+}
+
 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();