X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fboot.c;h=f9b0223bdf43c42adc30ba439b71ee156eb59a30;hb=b9c9da2c9fa23040870dff975a3ccd2beda6b297;hp=8c2e8e19607d1ff056479e084f58c6d958a5be9c;hpb=e9fd07f945135224708253845a2fa08943755b53;p=petitboot

diff --git a/discover/boot.c b/discover/boot.c
index 8c2e8e1..f9b0223 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -21,12 +21,17 @@
 #include "resource.h"
 
 static const char *boot_hook_dir = PKG_SYSCONF_DIR "/boot.d";
+enum {
+	BOOT_HOOK_EXIT_OK	= 0,
+	BOOT_HOOK_EXIT_UPDATE	= 2,
+};
+
 
 struct boot_task {
 	char *local_image;
 	char *local_initrd;
 	char *local_dtb;
-	const char *args;
+	char *args;
 
 	bool dry_run;
 };
@@ -48,20 +53,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,10 +81,6 @@ static int kexec_load(struct boot_task *boot_task)
 	if (result)
 		pb_log("%s: failed: (%d)\n", __func__, result);
 
-	talloc_free(s_initrd);
-	talloc_free(s_dtb);
-	talloc_free(s_args);
-
 	return result;
 }
 
@@ -148,6 +151,72 @@ static void update_status(boot_status_fn fn, void *arg, int type,
 	fn(arg, &status);
 }
 
+static void boot_hook_update_param(void *ctx, struct boot_task *task,
+		const char *name, const char *value)
+{
+	struct p {
+		const char *name;
+		char **p;
+	} *param, params[] = {
+		{ "boot_image",		&task->local_image },
+		{ "boot_initrd",	&task->local_initrd },
+		{ "boot_dtb",		&task->local_dtb },
+		{ "boot_args",		&task->args },
+		{ NULL, NULL },
+	};
+
+	for (param = params; param->name; param++) {
+		if (strcmp(param->name, name))
+			continue;
+
+		*param->p = talloc_strdup(ctx, value);
+		return;
+	}
+}
+
+static void boot_hook_update(struct boot_task *task, const char *hookname,
+		char *buf)
+{
+	char *line, *name, *val, *sep;
+	char *saveptr;
+
+	for (;; buf = NULL) {
+
+		line = strtok_r(buf, "\n", &saveptr);
+		if (!line)
+			break;
+
+		sep = strchr(line, '=');
+		if (!sep)
+			continue;
+
+		*sep = '\0';
+		name = line;
+		val = sep + 1;
+
+		boot_hook_update_param(task, task, name, val);
+
+		pb_log("boot hook %s specified %s=%s\n",
+				hookname, name, val);
+	}
+}
+
+static void boot_hook_setenv(struct boot_task *task)
+{
+	unsetenv("boot_image");
+	unsetenv("boot_initrd");
+	unsetenv("boot_dtb");
+	unsetenv("boot_args");
+
+	setenv("boot_image", task->local_image, 1);
+	if (task->local_initrd)
+		setenv("boot_initrd", task->local_initrd, 1);
+	if (task->local_dtb)
+		setenv("boot_dtb", task->local_dtb, 1);
+	if (task->args)
+		setenv("boot_args", task->args, 1);
+}
+
 static int hook_filter(const struct dirent *dirent)
 {
 	return dirent->d_type == DT_REG || dirent->d_type == DT_LNK;
@@ -158,8 +227,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;
@@ -171,20 +240,14 @@ static void run_boot_hooks(void *ctx, struct boot_task *task,
 	update_status(status_fn, status_arg, BOOT_STATUS_INFO,
 			"running boot hooks");
 
-	/* pass boot data to hooks */
-	setenv("boot_image", task->local_image, 1);
-	if (task->local_initrd)
-		setenv("boot_initrd", task->local_initrd, 1);
-	if (task->local_dtb)
-		setenv("boot_dtb", task->local_dtb, 1);
-	if (task->args)
-		setenv("boot_args", task->args, 1);
+	boot_hook_setenv(task);
 
 	for (i = 0; i < n; i++) {
-		char *path;
 		const char *argv[2] = { NULL, NULL };
+		char *path, *buf;
+		int buf_len, 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))
 			continue;
@@ -192,8 +255,18 @@ static void run_boot_hooks(void *ctx, struct boot_task *task,
 		pb_log("running boot hook %s\n", hooks[i]->d_name);
 
 		argv[0] = path;
-		pb_run_cmd(argv, 1, task->dry_run);
+		rc = pb_run_cmd_pipe(argv, 1, task->dry_run, task,
+				&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(task, hooks[i]->d_name, buf);
+			boot_hook_setenv(task);
+		}
 
+		talloc_free(buf);
 		talloc_free(path);
 	}
 
@@ -203,7 +276,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;
@@ -213,7 +286,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);
@@ -224,6 +296,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) {
@@ -237,54 +312,53 @@ 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;
 
 	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;
 	}
 
-	boot_task.local_initrd = NULL;
 	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;
 		}
 	}
 
-	boot_task.local_dtb = NULL;
 	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,
@@ -293,21 +367,19 @@ 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);
+		unlink(boot_task->local_dtb);
 
-	talloc_free(boot_task.local_image);
-	talloc_free(boot_task.local_initrd);
-	talloc_free(boot_task.local_dtb);
+	talloc_free(boot_task);
 
 	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->dry_run);
 
 		if (result) {
 			update_status(status_fn, status_arg, BOOT_STATUS_ERROR,