X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpaths.c;h=54774cf3b6135cb9ffdac41b0f3f731e7699d1b0;hp=0c8cc8b0d4c1a84596c66ab1f27073cff5446435;hb=a1fb38f17bfa60aac89d0dd21dd8ccc739d794bf;hpb=66bf929fa97fabb70198455f9eec2e9ccf0661fa

diff --git a/discover/paths.c b/discover/paths.c
index 0c8cc8b..54774cf 100644
--- a/discover/paths.c
+++ b/discover/paths.c
@@ -86,7 +86,7 @@ static void load_url_process_exit(struct process *process)
 
 	if (result->status == LOAD_CANCELLED) {
 		load_url_result_cleanup_local(result);
-	} else if (process->exit_status == 0) {
+	} else if (process_exit_ok(process)) {
 		result->status = LOAD_OK;
 	} else {
 		result->status = LOAD_ERROR;
@@ -131,7 +131,10 @@ static void load_process_to_local_file(struct load_task *task,
 		task->result->status = rc ? LOAD_ERROR : LOAD_ASYNC;
 	} else {
 		rc = process_run_sync(task->process);
-		task->result->status = rc ? LOAD_ERROR : LOAD_OK;
+		if (rc || !process_exit_ok(task->process))
+			task->result->status = LOAD_ERROR;
+		else
+			task->result->status = LOAD_OK;
 		process_release(task->process);
 		task->process = NULL;
 	}
@@ -222,6 +225,7 @@ static enum tftp_type check_tftp_type(void *ctx)
 	process->path = pb_system_apps.tftp;
 	process->argv = argv;
 	process->keep_stdout = true;
+	process->add_stderr = true;
 	process_run_sync(process);
 
 	if (!process->stdout_buf || process->stdout_len == 0) {