projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
preinit: define _GNU_SOURCE
[project/procd.git]
/
rcS.c
diff --git
a/rcS.c
b/rcS.c
index 48131462631b2c3ba7624195f722a032973eea0a..4ecf0c10d7da1392c905717c2f15906ea6f5fe6e 100644
(file)
--- a/
rcS.c
+++ b/
rcS.c
@@
-24,6
+24,7
@@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <fcntl.h>
#include <glob.h>
#include <libubox/ustream.h>
#include <glob.h>
#include <libubox/ustream.h>
@@
-42,6
+43,7
@@
struct initd {
static void pipe_cb(struct ustream *s, int bytes)
{
static void pipe_cb(struct ustream *s, int bytes)
{
+ struct initd *initd = container_of(s, struct initd, fd.stream);
char *newline, *str;
int len;
char *newline, *str;
int len;
@@
-54,9
+56,9
@@
static void pipe_cb(struct ustream *s, int bytes)
break;
*newline = 0;
len = newline + 1 - str;
break;
*newline = 0;
len = newline + 1 - str;
- ULOG_NOTE("%s
"
, str);
+ ULOG_NOTE("%s
: %s", initd->file
, str);
#ifdef SHOW_BOOT_ON_CONSOLE
#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);
#endif
ustream_consume(s, len);
} while (1);
@@
-87,9
+89,15
@@
static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
return;
}
close(pipefd[0]);
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);
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);
}
execlp(s->file, s->file, s->param, NULL);
exit(1);
}