X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fprocess%2Fprocess.c;h=c1606a52b342406de99d44d9cd07a678a327ba29;hp=f7e5b8faa2d1af4595fb479fe3d39b429184ad90;hb=2914110af0cc490566446f18c929452368121b98;hpb=8b46ab92aeff52b7354bf4f250835f75b4bd824c diff --git a/lib/process/process.c b/lib/process/process.c index f7e5b8f..c1606a5 100644 --- a/lib/process/process.c +++ b/lib/process/process.c @@ -114,7 +114,7 @@ static int process_setup_stdout_pipe(struct process_info *procinfo) { int rc; - if (!procinfo->process.keep_stdout) + if (!procinfo->process.keep_stdout || procinfo->process.raw_stdout) return 0; procinfo->stdout_buf_len = 4096; @@ -132,7 +132,7 @@ static int process_setup_stdout_pipe(struct process_info *procinfo) static void process_setup_stdout_parent(struct process_info *procinfo) { - if (!procinfo->process.keep_stdout) + if (!procinfo->process.keep_stdout || procinfo->process.raw_stdout) return; close(procinfo->stdout_pipe[1]); @@ -142,6 +142,9 @@ static void process_setup_stdout_child(struct process_info *procinfo) { int log = fileno(pb_log_get_stream()); + if (procinfo->process.raw_stdout) + return; + if (procinfo->process.keep_stdout) dup2(procinfo->stdout_pipe[1], STDOUT_FILENO); else