X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=state.c;h=1ed70f542f13d3ec7b8a3d3cf2fcf8e31cf42cd8;hp=618d75879051a3e042da6763f196a11e599a59d1;hb=7df968175ffd3bc7df5682d5852fbf20fe454759;hpb=3018420f7fd004b48715100d2f60b27c64d48b75

diff --git a/state.c b/state.c
index 618d758..1ed70f5 100644
--- a/state.c
+++ b/state.c
@@ -12,18 +12,25 @@
  * GNU General Public License for more details.
  */
 
+#include <fcntl.h>
 #include <sys/reboot.h>
+#include <stdio.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"
+#include "utils/utils.h"
 
 enum {
 	STATE_NONE = 0,
 	STATE_EARLY,
+	STATE_UBUS,
 	STATE_INIT,
 	STATE_RUNNING,
 	STATE_SHUTDOWN,
@@ -34,26 +41,90 @@ enum {
 static int state = STATE_NONE;
 static int reboot_event;
 
+static void set_stdio(const char* tty)
+{
+	if (chdir("/dev") ||
+	    !freopen(tty, "r", stdin) ||
+	    !freopen(tty, "w", stdout) ||
+	    !freopen(tty, "w", stderr) ||
+	    chdir("/"))
+		ERROR("failed to set stdio\n");
+	else
+		fcntl(STDERR_FILENO, F_SETFL, fcntl(STDERR_FILENO, F_GETFL) | O_NONBLOCK);
+}
+
+static void set_console(void)
+{
+	const char* tty;
+	char* split;
+	char line[ 20 ];
+	const char* try[] = { "tty0", "console", NULL }; /* Try the most common outputs */
+	int f, i = 0;
+
+	tty = get_cmdline_val("console",line,sizeof(line));
+	if (tty != NULL) {
+		split = strchr(tty, ',');
+		if ( split != NULL )
+			*split = '\0';
+	} else {
+		// Try a default
+		tty=try[i];
+		i++;
+	}
+
+	if (chdir("/dev")) {
+		ERROR("failed to change dir to /dev\n");
+		return;
+	}
+	while (tty!=NULL) {
+		f = open(tty, O_RDONLY);
+		if (f >= 0) {
+			close(f);
+			break;
+		}
+
+		tty=try[i];
+		i++;
+	}
+	if (chdir("/"))
+		ERROR("failed to change dir to /\n");
+
+	if (tty != NULL)
+		set_stdio(tty);
+}
+
 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);
+		set_stdio("console");
+		LOG("- ubus -\n");
+		procd_connect_ubus();
+		service_init();
+		service_start_early("ubus", ubus_cmd);
+		break;
+
 	case STATE_INIT:
 		LOG("- init -\n");
-		log_init();
-		procd_connect_ubus();
 		procd_inittab();
 		procd_inittab_run("respawn");
 		procd_inittab_run("askconsole");
 		procd_inittab_run("askfirst");
 		procd_inittab_run("sysinit");
+
+		// switch to syslog log channel
+		ulog_open(ULOG_SYSLOG, LOG_DAEMON, "procd");
 		break;
 
 	case STATE_RUNNING:
@@ -61,15 +132,42 @@ static void state_enter(void)
 		break;
 
 	case STATE_SHUTDOWN:
+		/* Redirect output to the console for the users' benefit */
+		set_console();
 		LOG("- shutdown -\n");
 		procd_inittab_run("shutdown");
+		sync();
 		break;
 
 	case STATE_HALT:
-		LOG("- reboot -\n");
+		// To prevent killed processes from interrupting the sleep
+		signal(SIGCHLD, SIG_IGN);
+		LOG("- SIGTERM processes -\n");
+		kill(-1, SIGTERM);
 		sync();
 		sleep(1);
-		reboot(reboot_event);
+		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:
@@ -80,14 +178,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();