summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Levand <geoff@infradead.org>2018-08-02 17:29:36 +0000
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2018-08-07 11:30:36 +1000
commitec07742d2a37f8f96705fc0f20d9b22b583dad57 (patch)
tree2ad33808f7800b8a6e998a1c4e618f358c21821b
parent51fb307dfdbb8f238d15520a74e33ef4fea52e4d (diff)
downloadtalos-petitboot-ec07742d2a37f8f96705fc0f20d9b22b583dad57.tar.gz
talos-petitboot-ec07742d2a37f8f96705fc0f20d9b22b583dad57.zip
discover/powerpc: Use process_get_stdout
Signed-off-by: Geoff Levand <geoff@infradead.org> Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
-rw-r--r--discover/platform-powerpc.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 22d213d..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;
}
OpenPOWER on IntegriCloud