X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fprocess%2Fprocess.c;h=86c7fbbf246c374d50f1c23a637118079817a27c;hp=6fac6492eeedd2524c71de8d4ee620a73cc3b47b;hb=c6dad307d1c305015066e179d392fae695b8cf08;hpb=815df381d55e09fd291145ef2b86729c12583366

diff --git a/lib/process/process.c b/lib/process/process.c
index 6fac649..86c7fbb 100644
--- a/lib/process/process.c
+++ b/lib/process/process.c
@@ -125,7 +125,10 @@ static void process_setup_stdout_child(struct process_info *procinfo)
 	else
 		dup2(log, STDOUT_FILENO);
 
-	dup2(log, STDERR_FILENO);
+	if (procinfo->process.keep_stdout && procinfo->process.add_stderr)
+		dup2(procinfo->stdout_pipe[1], STDERR_FILENO);
+	else
+		dup2(log, STDERR_FILENO);
 }
 
 static void process_finish_stdout(struct process_info *procinfo)
@@ -355,8 +358,13 @@ int process_run_sync(struct process *process)
 
 	process_read_stdout(procinfo);
 
-	rc = waitpid(process->pid, &process->exit_status, 0);
-	if (rc == -1) {
+	for (;;) {
+		rc = waitpid(process->pid, &process->exit_status, 0);
+		if (rc >= 0)
+			break;
+		if (errno == EINTR)
+			continue;
+
 		pb_log("%s: waitpid failed: %s\n", __func__, strerror(errno));
 		return rc;
 	}
@@ -439,3 +447,9 @@ int process_run_simple(void *ctx, const char *name, ...)
 
 	return rc;
 }
+
+bool process_exit_ok(struct process *process)
+{
+	return WIFEXITED(process->exit_status) &&
+		WEXITSTATUS(process->exit_status) == 0;
+}