X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=state.c;h=22a06a14f9be2c61714e89494cd82bde97845281;hp=c5d90b6718106d614b28fcf5ac788f68135c6e0e;hb=9851e517f1c3e55228e2fdde913c9cf0b87a4bc7;hpb=542c5374259fa5a4c4d009efd6b23b46d51cba15

diff --git a/state.c b/state.c
index c5d90b6..22a06a1 100644
--- a/state.c
+++ b/state.c
@@ -12,7 +12,9 @@
  * 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>
@@ -23,10 +25,12 @@
 #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,
@@ -37,6 +41,52 @@ enum {
 static int state = STATE_NONE;
 static int reboot_event;
 
+static void set_stdio(const char* tty)
+{
+	chdir("/dev");
+	freopen(tty, "r", stdin);
+	freopen(tty, "w", stdout);
+	freopen(tty, "w", stderr);
+	chdir("/");
+	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++;
+	}
+
+	chdir("/dev");
+	while (tty!=NULL) {
+		f = open(tty, O_RDONLY);
+		if (f >= 0) {
+			close(f);
+			break;
+		}
+
+		tty=try[i];
+		i++;
+	}
+	chdir("/");
+
+	if (tty != NULL)
+		set_stdio(tty);
+}
+
 static void state_enter(void)
 {
 	char ubus_cmd[] = "/sbin/ubusd";
@@ -49,21 +99,26 @@ static void state_enter(void)
 		procd_coldplug();
 		break;
 
-	case STATE_INIT:
+	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();
-
-		LOG("- init -\n");
 		service_init();
 		service_start_early("ubus", ubus_cmd);
+		break;
 
+	case STATE_INIT:
+		LOG("- init -\n");
 		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:
@@ -71,12 +126,16 @@ 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:
+		// To prevent killed processes from interrupting the sleep
+		signal(SIGCHLD, SIG_IGN);
 		LOG("- SIGTERM processes -\n");
 		kill(-1, SIGTERM);
 		sync();
@@ -118,6 +177,12 @@ void procd_state_next(void)
 	state_enter();
 }
 
+void procd_state_ubus_connect(void)
+{
+	if (state == STATE_UBUS)
+		procd_state_next();
+}
+
 void procd_shutdown(int event)
 {
 	if (state >= STATE_SHUTDOWN)