X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fplatform-powerpc.c;h=2ee376d0d9fa29d641e55f5948e2c7f9bcf79a20;hp=df8c7d611d26a0c46c97de0bd921fc82e1414520;hb=c3dfc9b7b91045172d460651c0309b09b0ab121a;hpb=d09e1761f51f3cba8ca6190380f4a312948d8f4c

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index df8c7d6..2ee376d 100644
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -148,7 +148,7 @@ static int parse_nvram_params(struct platform_powerpc *platform,
 
 static int parse_nvram(struct platform_powerpc *platform)
 {
-	struct process *process;
+	struct process_stdout *stdout;
 	const char *argv[5];
 	int rc;
 
@@ -158,23 +158,17 @@ static int parse_nvram(struct platform_powerpc *platform)
 	argv[3] = partition;
 	argv[4] = NULL;
 
-	process = process_create(platform);
-	process->path = "nvram";
-	process->argv = argv;
-	process->keep_stdout = true;
+	rc = process_get_stdout_argv(NULL, &stdout, argv);
 
-	rc = process_run_sync(process);
-
-	if (rc || !process_exit_ok(process)) {
+	if (rc) {
 		fprintf(stderr, "nvram process returned "
 				"non-zero exit status\n");
 		rc = -1;
 	} else {
-		rc = parse_nvram_params(platform, process->stdout_buf,
-					    process->stdout_len);
+		rc = parse_nvram_params(platform, stdout->buf, stdout->len);
 	}
 
-	process_release(process);
+	talloc_free(stdout);
 	return rc;
 }
 
@@ -1193,7 +1187,7 @@ static void get_ipmi_network_override(struct platform_powerpc *platform,
 	memcpy(&cookie, &resp[i], sizeof(cookie));
 	cookie = __be32_to_cpu(cookie);
 	if (cookie != magic_value) {
-		pb_log("%s: Incorrect cookie %x\n", __func__, cookie);
+		pb_log_fn("Incorrect cookie %x\n", cookie);
 		return;
 	}
 	i += sizeof(cookie);
@@ -1259,7 +1253,7 @@ static int load_config(struct platform *p, struct config *config)
 
 	rc = parse_nvram(platform);
 	if (rc)
-		pb_log("%s: Failed to parse nvram\n", __func__);
+		pb_log_fn("Failed to parse nvram\n");
 
 	populate_config(platform, config);