X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=state.c;h=ccf410454711880c1f3639f4a84bb8ea42e9a05c;hp=22a06a14f9be2c61714e89494cd82bde97845281;hb=846e20cb655dd255e4caec2d1fe2628af35639e8;hpb=4bccbfa967d756b8c84a62ea4752e936d8545a73

diff --git a/state.c b/state.c
index 22a06a1..ccf4104 100644
--- a/state.c
+++ b/state.c
@@ -43,12 +43,14 @@ 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);
+	if (chdir("/dev") ||
+	    !freopen(tty, "r", stdin) ||
+	    !freopen(tty, "w", stdout) ||
+	    !freopen(tty, "w", stderr) ||
+	    chdir("/"))
+		ERROR("failed to set stdio: %m\n");
+	else
+		fcntl(STDERR_FILENO, F_SETFL, fcntl(STDERR_FILENO, F_GETFL) | O_NONBLOCK);
 }
 
 static void set_console(void)
@@ -70,7 +72,10 @@ static void set_console(void)
 		i++;
 	}
 
-	chdir("/dev");
+	if (chdir("/dev")) {
+		ERROR("failed to change dir to /dev: %m\n");
+		return;
+	}
 	while (tty!=NULL) {
 		f = open(tty, O_RDONLY);
 		if (f >= 0) {
@@ -81,7 +86,8 @@ static void set_console(void)
 		tty=try[i];
 		i++;
 	}
-	chdir("/");
+	if (chdir("/"))
+		ERROR("failed to change dir to /: %m\n");
 
 	if (tty != NULL)
 		set_stdio(tty);
@@ -105,7 +111,6 @@ static void state_enter(void)
 		set_stdio("console");
 		LOG("- ubus -\n");
 		procd_connect_ubus();
-		service_init();
 		service_start_early("ubus", ubus_cmd);
 		break;
 
@@ -123,6 +128,8 @@ static void state_enter(void)
 
 	case STATE_RUNNING:
 		LOG("- init complete -\n");
+		procd_inittab_run("respawnlate");
+		procd_inittab_run("askconsolelate");
 		break;
 
 	case STATE_SHUTDOWN:
@@ -144,6 +151,7 @@ static void state_enter(void)
 		kill(-1, SIGKILL);
 		sync();
 		sleep(1);
+#ifndef DISABLE_INIT
 		if (reboot_event == RB_POWER_OFF)
 			LOG("- power down -\n");
 		else
@@ -159,9 +167,11 @@ static void state_enter(void)
 			reboot(reboot_event);
 			_exit(EXIT_SUCCESS);
 		}
-
 		while (1)
 			sleep(1);
+#else
+		exit(0);
+#endif
 		break;
 
 	default: