X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=initd%2Finit.c;h=e453cff21e426bc80bf7bc3cbf92df42aea0db80;hp=d8490f8505c09a08857464386593ad5f5a40cf2a;hb=63789e51ed913394c6bd4ac34e40ed0c8fcccccf;hpb=79872ea6ca5867631c1ec5405721af12bea818b2

diff --git a/initd/init.c b/initd/init.c
index d8490f8..e453cff 100644
--- a/initd/init.c
+++ b/initd/init.c
@@ -72,6 +72,8 @@ main(int argc, char **argv)
 {
 	pid_t pid;
 
+	ulog_open(ULOG_KMSG, LOG_DAEMON, "init");
+
 	sigaction(SIGTERM, &sa_shutdown, NULL);
 	sigaction(SIGUSR1, &sa_shutdown, NULL);
 	sigaction(SIGUSR2, &sa_shutdown, NULL);
@@ -84,25 +86,25 @@ main(int argc, char **argv)
 	if (!pid) {
 		char *kmod[] = { "/sbin/kmodloader", "/etc/modules-boot.d/", NULL };
 
-		if (debug < 3) {
-			int fd = open("/dev/null", O_RDWR);
+		if (debug < 3)
+			patch_stdio("/dev/null");
 
-			if (fd > -1) {
-				dup2(fd, STDIN_FILENO);
-				dup2(fd, STDOUT_FILENO);
-				dup2(fd, STDERR_FILENO);
-				if (fd > STDERR_FILENO)
-					close(fd);
-			}
-		}
 		execvp(kmod[0], kmod);
 		ERROR("Failed to start kmodloader\n");
 		exit(-1);
 	}
-	if (pid <= 0)
+	if (pid <= 0) {
 		ERROR("Failed to start kmodloader instance\n");
-	else
-		waitpid(pid, NULL, 0);
+	} else {
+		int i;
+
+		for (i = 0; i < 1200; i++) {
+			if (waitpid(pid, NULL, WNOHANG) > 0)
+				break;
+			usleep(10 * 1000);
+			watchdog_ping();
+		}
+	}
 	uloop_init();
 	preinit();
 	uloop_run();