X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=ce9c1e099f071d51245b8610e90db514fcb7a29b;hp=0237b0c962209fe65aa8b2f394946adbc24d656f;hb=1d69ceee0b8fac1f4451a75b6e4b14ee2d5d91dc;hpb=2312c424d516862877c45a9566816acfe2da0f06

diff --git a/discover/boot.c b/discover/boot.c
index 0237b0c..ce9c1e0 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -1,5 +1,7 @@
 
-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 
 #include <stdbool.h>
 #include <stdlib.h>
@@ -9,13 +11,13 @@
 #include <fcntl.h>
 #include <sys/types.h>
 
-#include <array-size/array-size.h>
 #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>
+#include <util/util.h>
 
 #include "device-handler.h"
 #include "boot.h"
@@ -32,6 +34,9 @@ struct boot_task {
 	struct load_url_result *image;
 	struct load_url_result *initrd;
 	struct load_url_result *dtb;
+	const char *local_image;
+	const char *local_initrd;
+	const char *local_dtb;
 	const char *args;
 	boot_status_fn status_fn;
 	void *status_arg;
@@ -55,16 +60,16 @@ static int kexec_load(struct boot_task *boot_task)
 	*p++ = pb_system_apps.kexec;	/* 1 */
 	*p++ = "-l";			/* 2 */
 
-	if (boot_task->initrd) {
+	if (boot_task->local_initrd) {
 		s_initrd = talloc_asprintf(boot_task, "--initrd=%s",
-				boot_task->initrd->local);
+				boot_task->local_initrd);
 		assert(s_initrd);
 		*p++ = s_initrd;	 /* 3 */
 	}
 
-	if (boot_task->dtb) {
+	if (boot_task->local_dtb) {
 		s_dtb = talloc_asprintf(boot_task, "--dtb=%s",
-						boot_task->dtb->local);
+						boot_task->local_dtb);
 		assert(s_dtb);
 		*p++ = s_dtb;		 /* 4 */
 	}
@@ -76,7 +81,7 @@ static int kexec_load(struct boot_task *boot_task)
 		*p++ = s_args;		/* 5 */
 	}
 
-	*p++ = boot_task->image->local;	/* 6 */
+	*p++ = boot_task->local_image;	/* 6 */
 	*p++ = NULL;			/* 7 */
 
 	result = process_run_simple_argv(boot_task, argv);
@@ -151,9 +156,9 @@ static void boot_hook_update_param(void *ctx, struct boot_task *task,
 		const char *name;
 		const char **p;
 	} *param, params[] = {
-		{ "boot_image",		&task->image->local },
-		{ "boot_initrd",	&task->initrd->local },
-		{ "boot_dtb",		&task->dtb->local },
+		{ "boot_image",		&task->local_image },
+		{ "boot_initrd",	&task->local_initrd },
+		{ "boot_dtb",		&task->local_dtb },
 		{ "boot_args",		&task->args },
 		{ NULL, NULL },
 	};
@@ -201,11 +206,11 @@ static void boot_hook_setenv(struct boot_task *task)
 	unsetenv("boot_dtb");
 	unsetenv("boot_args");
 
-	setenv("boot_image", task->image->local, 1);
-	if (task->initrd)
-		setenv("boot_initrd", task->initrd->local, 1);
-	if (task->dtb)
-		setenv("boot_dtb", task->dtb->local, 1);
+	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);
 }
@@ -266,11 +271,9 @@ static void run_boot_hooks(struct boot_task *task)
 			/* 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);
-			}
+			boot_hook_update(task, hooks[i]->d_name,
+					process->stdout_buf);
+			boot_hook_setenv(task);
 		}
 
 		process_release(process);
@@ -337,6 +340,11 @@ static void cleanup_cancellations(struct boot_task *task,
 		} else if (result->status == LOAD_ASYNC) {
 			load_url_async_cancel(result);
 			pending = true;
+
+		/* if we're waiting for a cancellation, we still need to
+		 * wait for the completion before freeing the boot task */
+		} else if (result->status == LOAD_CANCELLED) {
+			pending = true;
 		}
 	}
 
@@ -364,6 +372,12 @@ static void boot_process(struct load_url_result *result, void *data)
 			check_load(task, "dtb", task->dtb))
 		goto no_load;
 
+	/* we make a copy of the local paths, as the boot hooks might update
+	 * and/or create these */
+	task->local_image = task->image ? task->image->local : NULL;
+	task->local_initrd = task->initrd ? task->initrd->local : NULL;
+	task->local_dtb = task->dtb ? task->dtb->local : NULL;
+
 	run_boot_hooks(task);
 
 	update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,