From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Sat, 11 Mar 2017 00:48:16 +0000 (+0100)
Subject: procd: Log initscript output prefixed with script name
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1247db1e2be1fd8140cfa2aa93e4c97f7785a3ba;p=oweals%2Fprocd.git

procd: Log initscript output prefixed with script name

It helps with debugging of initscript problems.

Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
---

diff --git a/rcS.c b/rcS.c
index 4813146..0dc0aa2 100644
--- a/rcS.c
+++ b/rcS.c
@@ -42,6 +42,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 +55,9 @@ static void pipe_cb(struct ustream *s, int bytes)
 			break;
 		*newline = 0;
 		len = newline + 1 - str;
-		ULOG_NOTE("%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);