static void pipe_cb(struct ustream *s, int bytes)
{
- struct ustream_buf *buf = s->r.head;
char *newline, *str;
int len;
str = ustream_get_read_buf(s, NULL);
if (!str)
break;
- newline = strchr(buf->data, '\n');
+ newline = strchr(str, '\n');
if (!newline)
break;
*newline = 0;
len = newline + 1 - str;
- syslog(0, buf->data);
+ syslog(0, "%s", str);
+#ifdef SHOW_BOOT_ON_CONSOLE
+ fprintf(stderr, "%s\n", str);
+#endif
ustream_consume(s, len);
} while (1);
}
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;