procd: Don't use syslog before its initialization

[project/procd.git] / rcS.c

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