procd: support relayoing daemon stdout/stderr to syslog

[project/procd.git] / rcS.c

diff --git a/rcS.c b/rcS.c
index eb1c467..8c72c19 100644 (file)
--- a/rcS.c
+++ b/rcS.c
@@ -54,7 +54,10 @@ static void pipe_cb(struct ustream *s, int bytes)
                        break;
                *newline = 0;
                len = newline + 1 - str;
-               syslog(0, str);
+               syslog(0, "%s", str);
+#ifdef SHOW_BOOT_ON_CONSOLE
+               fprintf(stderr, "%s\n", str);
+#endif
                ustream_consume(s, len);
        } while (1);
 }
@@ -114,7 +117,7 @@ static void add_initd(struct runqueue *q, char *file, char *param)
        s = calloc_a(sizeof(*s), &f, strlen(file) + 1, &p, strlen(param) + 1);
        s->proc.task.type = &initd_type;
        s->proc.task.complete = q_initd_complete;
-       if (!strcmp(param, "stop"))
+       if (!strcmp(param, "stop") || !strcmp(param, "shutdown"))
                s->proc.task.run_timeout = 15000;
        s->param = p;
        s->file = f;