X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=rcS.c;h=b1202bf96613d19ee076ee700ad234e6cfcc9db6;hp=0208a75ac76ac33a34d8f10f1978e5d9335a3e3e;hb=006c19c45464648a356e200f8ef011b021b9ff6f;hpb=5f9124103410c178d816bb5229fba7dd2286a49b

diff --git a/rcS.c b/rcS.c
index 0208a75..b1202bf 100644
--- a/rcS.c
+++ b/rcS.c
@@ -24,6 +24,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 #include <glob.h>
 
 #include <libubox/ustream.h>
@@ -42,6 +43,7 @@ struct initd {
 
 static void pipe_cb(struct ustream *s, int bytes)
 {
+	struct initd *initd = container_of(s, struct initd, fd.stream);
 	char *newline, *str;
 	int len;
 
@@ -54,9 +56,9 @@ static void pipe_cb(struct ustream *s, int bytes)
 			break;
 		*newline = 0;
 		len = newline + 1 - str;
-		syslog(LOG_NOTICE, "%s", str);
+		ULOG_NOTE("%s: %s", initd->file, str);
 #ifdef SHOW_BOOT_ON_CONSOLE
-		fprintf(stderr, "%s\n", str);
+		fprintf(stderr, "%s: %s\n", initd->file, str);
 #endif
 		ustream_consume(s, len);
 	} while (1);
@@ -80,6 +82,7 @@ static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
 
 	if (pid) {
 		close(pipefd[1]);
+		fcntl(pipefd[0], F_SETFD, FD_CLOEXEC);
 		s->fd.stream.string_data = true,
 		s->fd.stream.notify_read = pipe_cb,
 		runqueue_process_add(q, &s->proc, pid);
@@ -87,9 +90,15 @@ static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
 		return;
 	}
 	close(pipefd[0]);
+
+	int devnull = open("/dev/null", O_RDONLY);
+	dup2(devnull, STDIN_FILENO);
 	dup2(pipefd[1], STDOUT_FILENO);
 	dup2(pipefd[1], STDERR_FILENO);
 
+	if (devnull > STDERR_FILENO)
+		close(devnull);
+
 	execlp(s->file, s->file, s->param, NULL);
 	exit(1);
 }