X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=e7a72d4330c67d4586912cfb2e2c2994f3095203;hp=e57810d54d46a10687c0182d9004d63b0349d188;hb=4400b62c78526cf744d2aec3fba86911da936f7a;hpb=f9a63d3a640cb30a12598cedc0dd7d8b6fc5b4de

diff --git a/discover/boot.c b/discover/boot.c
index e57810d..e7a72d4 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -11,6 +11,7 @@
 
 #include <log/log.h>
 #include <pb-protocol/pb-protocol.h>
+#include <process/process.h>
 #include <system/system.h>
 #include <talloc/talloc.h>
 #include <url/url.h>
@@ -53,20 +54,22 @@ static int kexec_load(struct boot_task *boot_task)
 	*p++ = "-l";			/* 2 */
 
 	if (boot_task->local_initrd) {
-		s_initrd = talloc_asprintf(NULL, "--initrd=%s",
+		s_initrd = talloc_asprintf(boot_task, "--initrd=%s",
 				boot_task->local_initrd);
 		assert(s_initrd);
 		*p++ = s_initrd;	 /* 3 */
 	}
 
 	if (boot_task->local_dtb) {
-		s_dtb = talloc_asprintf(NULL, "--dtb=%s", boot_task->local_dtb);
+		s_dtb = talloc_asprintf(boot_task, "--dtb=%s",
+						boot_task->local_dtb);
 		assert(s_dtb);
 		*p++ = s_dtb;		 /* 4 */
 	}
 
 	if (boot_task->args) {
-		s_args = talloc_asprintf(NULL, "--append=%s", boot_task->args);
+		s_args = talloc_asprintf(boot_task, "--append=%s",
+						boot_task->args);
 		assert(s_args);
 		*p++ = s_args;		/* 5 */
 	}
@@ -74,15 +77,11 @@ static int kexec_load(struct boot_task *boot_task)
 	*p++ = boot_task->local_image;	/* 6 */
 	*p++ = NULL;			/* 7 */
 
-	result = pb_run_cmd(argv, 1, boot_task->dry_run);
+	result = process_run_simple_argv(boot_task, argv);
 
 	if (result)
 		pb_log("%s: failed: (%d)\n", __func__, result);
 
-	talloc_free(s_initrd);
-	talloc_free(s_dtb);
-	talloc_free(s_args);
-
 	return result;
 }
 
@@ -92,31 +91,18 @@ static int kexec_load(struct boot_task *boot_task)
  * Must only be called after a successful call to kexec_load().
  */
 
-static int kexec_reboot(bool dry_run)
+static int kexec_reboot(struct boot_task *task)
 {
-	int result = 0;
-	const char *argv[4];
-	const char **p;
+	int result;
 
 	/* First try running shutdown.  Init scripts should run 'exec -e' */
-
-	p = argv;
-	*p++ = pb_system_apps.shutdown;	/* 1 */
-	*p++ =  "-r";			/* 2 */
-	*p++ =  "now";			/* 3 */
-	*p++ =  NULL;			/* 4 */
-
-	result = pb_run_cmd(argv, 1, dry_run);
+	result = process_run_simple(task, pb_system_apps.shutdown, "-r",
+			"now", NULL);
 
 	/* On error, force a kexec with the -e option */
-
 	if (result) {
-		p = argv;
-		*p++ = pb_system_apps.kexec;	/* 1 */
-		*p++ = "-e";			/* 2 */
-		*p++ = NULL;			/* 3 */
-
-		result = pb_run_cmd(argv, 1, 0);
+		result = process_run_simple(task, pb_system_apps.kexec,
+						"-e", NULL);
 	}
 
 	if (result)
@@ -124,13 +110,8 @@ static int kexec_reboot(bool dry_run)
 
 	/* okay, kexec -e -f */
 	if (result) {
-		p = argv;
-		*p++ = pb_system_apps.kexec;	/* 1 */
-		*p++ = "-e";			/* 2 */
-		*p++ = "-f";			/* 3 */
-		*p++ = NULL;			/* 4 */
-
-		result = pb_run_cmd(argv, 1, 0);
+		result = process_run_simple(task, pb_system_apps.kexec,
+						"-e", "-f", NULL);
 	}
 
 	if (result)
@@ -176,8 +157,8 @@ static void boot_hook_update_param(void *ctx, struct boot_task *task,
 	}
 }
 
-static void boot_hook_update(void *ctx, const char *hookname,
-		struct boot_task *task, char *buf)
+static void boot_hook_update(struct boot_task *task, const char *hookname,
+		char *buf)
 {
 	char *line, *name, *val, *sep;
 	char *saveptr;
@@ -196,7 +177,7 @@ static void boot_hook_update(void *ctx, const char *hookname,
 		name = line;
 		val = sep + 1;
 
-		boot_hook_update_param(ctx, task, name, val);
+		boot_hook_update_param(task, task, name, val);
 
 		pb_log("boot hook %s specified %s=%s\n",
 				hookname, name, val);
@@ -229,8 +210,8 @@ static int hook_cmp(const struct dirent **a, const struct dirent **b)
 	return strcmp((*a)->d_name, (*b)->d_name);
 }
 
-static void run_boot_hooks(void *ctx, struct boot_task *task,
-		boot_status_fn status_fn, void *status_arg)
+static void run_boot_hooks(struct boot_task *task, boot_status_fn status_fn,
+		void *status_arg)
 {
 	struct dirent **hooks;
 	int i, n;
@@ -246,29 +227,44 @@ static void run_boot_hooks(void *ctx, struct boot_task *task,
 
 	for (i = 0; i < n; i++) {
 		const char *argv[2] = { NULL, NULL };
-		char *path, *buf;
-		int buf_len, rc;
+		struct process *process;
+		char *path;
+		int rc;
 
-		path = join_paths(ctx, boot_hook_dir, hooks[i]->d_name);
+		path = join_paths(task, boot_hook_dir, hooks[i]->d_name);
 
-		if (access(path, X_OK))
+		if (access(path, X_OK)) {
+			talloc_free(path);
 			continue;
+		}
 
-		pb_log("running boot hook %s\n", hooks[i]->d_name);
+		process = process_create(task);
 
 		argv[0] = path;
-		rc = pb_run_cmd_pipe(argv, 1, task->dry_run, ctx,
-				&buf, &buf_len);
-
-		/* if the hook returned with BOOT_HOOK_EXIT_UPDATE,
-		 * then we process stdout to look for updated params
-		 */
-		if (rc == BOOT_HOOK_EXIT_UPDATE) {
-			boot_hook_update(ctx, hooks[i]->d_name, task, buf);
-			boot_hook_setenv(task);
+		process->path = path;
+		process->argv = argv;
+		process->keep_stdout = true;
+
+		pb_log("running boot hook %s\n", hooks[i]->d_name);
+
+		rc = process_run_sync(process);
+		if (rc) {
+			pb_log("boot hook exec failed!\n");
+
+		} else if (WIFEXITED(process->exit_status) &&
+			   WEXITSTATUS(process->exit_status)
+				== BOOT_HOOK_EXIT_UPDATE) {
+			/* if the hook returned with BOOT_HOOK_EXIT_UPDATE,
+			 * then we process stdout to look for updated params
+			 */
+			if (rc == BOOT_HOOK_EXIT_UPDATE) {
+				boot_hook_update(task, hooks[i]->d_name,
+						process->stdout_buf);
+				boot_hook_setenv(task);
+			}
 		}
 
-		talloc_free(buf);
+		process_release(process);
 		talloc_free(path);
 	}
 
@@ -278,7 +274,7 @@ static void run_boot_hooks(void *ctx, struct boot_task *task,
 int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 		int dry_run, boot_status_fn status_fn, void *status_arg)
 {
-	struct boot_task boot_task;
+	struct boot_task *boot_task;
 	struct pb_url *image, *initrd, *dtb;
 	unsigned int clean_image = 0;
 	unsigned int clean_initrd = 0;
@@ -288,7 +284,6 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 	image = NULL;
 	initrd = NULL;
 	dtb = NULL;
-	boot_task.dry_run = dry_run;
 
 	if (cmd && cmd->boot_image_file) {
 		image = pb_url_parse(opt, cmd->boot_image_file);
@@ -299,6 +294,9 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 		return -1;
 	}
 
+	boot_task = talloc_zero(ctx, struct boot_task);
+	boot_task->dry_run = dry_run;
+
 	if (cmd && cmd->initrd_file) {
 		initrd = pb_url_parse(opt, cmd->initrd_file);
 	} else if (opt && opt->initrd) {
@@ -312,22 +310,20 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 	}
 
 	if (cmd && cmd->boot_args) {
-		boot_task.args = talloc_strdup(ctx, cmd->boot_args);
+		boot_task->args = talloc_strdup(boot_task, cmd->boot_args);
 	} else if (opt && opt->option->boot_args) {
-		boot_task.args = talloc_strdup(ctx, opt->option->boot_args);
+		boot_task->args = talloc_strdup(boot_task,
+						opt->option->boot_args);
 	} else {
-		boot_task.args = NULL;
+		boot_task->args = NULL;
 	}
 
 	result = -1;
 
-	boot_task.local_initrd = NULL;
-	boot_task.local_dtb = NULL;
-
 	update_status(status_fn, status_arg, BOOT_STATUS_INFO,
 			"loading kernel");
-	boot_task.local_image = load_url(NULL, image, &clean_image);
-	if (!boot_task.local_image) {
+	boot_task->local_image = load_url(NULL, image, &clean_image);
+	if (!boot_task->local_image) {
 		update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
 				"Couldn't load kernel image");
 		goto no_load;
@@ -336,8 +332,8 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 	if (initrd) {
 		update_status(status_fn, status_arg, BOOT_STATUS_INFO,
 				"loading initrd");
-		boot_task.local_initrd = load_url(NULL, initrd, &clean_initrd);
-		if (!boot_task.local_initrd) {
+		boot_task->local_initrd = load_url(NULL, initrd, &clean_initrd);
+		if (!boot_task->local_initrd) {
 			update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
 					"Couldn't load initrd image");
 			goto no_load;
@@ -347,20 +343,20 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 	if (dtb) {
 		update_status(status_fn, status_arg, BOOT_STATUS_INFO,
 				"loading device tree");
-		boot_task.local_dtb = load_url(NULL, dtb, &clean_dtb);
-		if (!boot_task.local_dtb) {
+		boot_task->local_dtb = load_url(NULL, dtb, &clean_dtb);
+		if (!boot_task->local_dtb) {
 			update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
 					"Couldn't load device tree");
 			goto no_load;
 		}
 	}
 
-	run_boot_hooks(ctx, &boot_task, status_fn, status_arg);
+	run_boot_hooks(boot_task, status_fn, status_arg);
 
 	update_status(status_fn, status_arg, BOOT_STATUS_INFO,
 			"performing kexec_load");
 
-	result = kexec_load(&boot_task);
+	result = kexec_load(boot_task);
 
 	if (result) {
 		update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
@@ -369,21 +365,17 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 
 no_load:
 	if (clean_image)
-		unlink(boot_task.local_image);
+		unlink(boot_task->local_image);
 	if (clean_initrd)
-		unlink(boot_task.local_initrd);
+		unlink(boot_task->local_initrd);
 	if (clean_dtb)
-		unlink(boot_task.local_dtb);
-
-	talloc_free(boot_task.local_image);
-	talloc_free(boot_task.local_initrd);
-	talloc_free(boot_task.local_dtb);
+		unlink(boot_task->local_dtb);
 
 	if (!result) {
 		update_status(status_fn, status_arg, BOOT_STATUS_INFO,
 				"performing kexec reboot");
 
-		result = kexec_reboot(boot_task.dry_run);
+		result = kexec_reboot(boot_task);
 
 		if (result) {
 			update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
@@ -391,5 +383,7 @@ no_load:
 		}
 	}
 
+	talloc_free(boot_task);
+
 	return result;
 }