X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=initd%2Finit.c;h=0349e6e9d77ef57288a10108326b2f8a43499d8a;hp=153b3c2d8efd21e5290d31ef7fc330a3da66f755;hb=846e20cb655dd255e4caec2d1fe2628af35639e8;hpb=61e88ee49ade4fd8014bb11ca3166d93274c50e8

diff --git a/initd/init.c b/initd/init.c
index 153b3c2..0349e6e 100644
--- a/initd/init.c
+++ b/initd/init.c
@@ -20,6 +20,7 @@
 #include <libubox/uloop.h>
 #include <libubus.h>
 
+#include <limits.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <getopt.h>
@@ -28,6 +29,7 @@
 #include <unistd.h>
 #include <stdio.h>
 
+#include "../utils/utils.h"
 #include "init.h"
 #include "../watchdog.h"
 
@@ -53,24 +55,16 @@ static struct sigaction sa_shutdown = {
 static void
 cmdline(void)
 {
-	char line[1024];
-	int r, fd = open("/proc/cmdline", O_RDONLY);
-	regex_t pat_cmdline;
-	regmatch_t matches[2];
-
-	if (fd < 0)
-		return;
-
-	r = read(fd, line, sizeof(line) - 1);
-	line[r] = '\0';
-	close(fd);
-
-	regcomp(&pat_cmdline, "init_debug=([0-9]+)", REG_EXTENDED);
-	if (!regexec(&pat_cmdline, line, 2, matches, 0)) {
-		line[matches[1].rm_eo] = '\0';
-		debug = atoi(&line[matches[1].rm_so]);
+	char line[20];
+	char* res;
+	long	r;
+
+	res = get_cmdline_val("init_debug", line, sizeof(line));
+	if (res != NULL) {
+		r = strtol(line, NULL, 10);
+		if ((r != LONG_MIN) && (r != LONG_MAX))
+			debug = (int) r;
 	}
-	regfree(&pat_cmdline);
 }
 
 int
@@ -78,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);
@@ -90,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");
+		ERROR("Failed to start kmodloader: %m\n");
 		exit(-1);
 	}
-	if (pid <= 0)
-		ERROR("Failed to start kmodloader instance\n");
-	else
-		waitpid(pid, NULL, 0);
+	if (pid <= 0) {
+		ERROR("Failed to start kmodloader instance: %m\n");
+	} 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();