#include <sys/types.h>
#include <sys/stat.h>
+#include <fcntl.h>
#include <glob.h>
#include <libubox/ustream.h>
static void pipe_cb(struct ustream *s, int bytes)
{
+ struct initd *initd = container_of(s, struct initd, fd.stream);
char *newline, *str;
int len;
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);
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);
}
}
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);