X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=0d3491fd6cb4a61ece94b3bb5c700ff36cb69841;hp=e5803a76dcf0fbc228f2c426b19c415c28d382ef;hb=27863350496534c1bdd6a2d48661f8973aed0945;hpb=66bf929fa97fabb70198455f9eec2e9ccf0661fa

diff --git a/discover/boot.c b/discover/boot.c
index e5803a7..0d3491f 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -18,6 +18,7 @@
 #include <talloc/talloc.h>
 #include <url/url.h>
 #include <util/util.h>
+#include <i18n/i18n.h>
 
 #include "device-handler.h"
 #include "boot.h"
@@ -176,7 +177,7 @@ static void boot_hook_update(struct boot_task *task, const char *hookname,
 		char *buf)
 {
 	char *line, *name, *val, *sep;
-	char *saveptr;
+	char *saveptr = NULL;
 
 	for (;; buf = NULL) {
 
@@ -235,7 +236,7 @@ static void run_boot_hooks(struct boot_task *task)
 		return;
 
 	update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
-			"running boot hooks");
+			_("running boot hooks"));
 
 	boot_hook_setenv(task);
 
@@ -298,7 +299,7 @@ static int check_load(struct boot_task *task, const char *name,
 
 	update_status(task->status_fn, task->status_arg,
 			BOOT_STATUS_ERROR,
-			"Couldn't load %s", name);
+			_("Couldn't load %s"), name);
 	return -1;
 }
 
@@ -340,6 +341,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;
 		}
 	}
 
@@ -376,12 +382,12 @@ static void boot_process(struct load_url_result *result, void *data)
 	run_boot_hooks(task);
 
 	update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
-			"performing kexec_load");
+			_("performing kexec_load"));
 
 	rc = kexec_load(task);
 	if (rc) {
 		update_status(task->status_fn, task->status_arg,
-				BOOT_STATUS_ERROR, "kexec load failed");
+				BOOT_STATUS_ERROR, _("kexec load failed"));
 	}
 
 no_load:
@@ -392,13 +398,13 @@ no_load:
 	if (!rc) {
 		update_status(task->status_fn, task->status_arg,
 				BOOT_STATUS_INFO,
-				"performing kexec reboot");
+				_("performing kexec reboot"));
 
 		rc = kexec_reboot(task);
 		if (rc) {
 			update_status(task->status_fn, task->status_arg,
 					BOOT_STATUS_ERROR,
-					"kexec reboot failed");
+					_("kexec reboot failed"));
 		}
 	}
 }
@@ -413,7 +419,7 @@ static int start_url_load(struct boot_task *task, const char *name,
 	if (!*result) {
 		update_status(task->status_fn, task->status_arg,
 				BOOT_STATUS_ERROR,
-				"Error loading %s", name);
+				_("Error loading %s"), name);
 		return -1;
 	}
 	return 0;
@@ -433,10 +439,10 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 	else if (cmd && cmd->boot_image_file)
 		boot_desc = cmd->boot_image_file;
 	else
-		boot_desc = "(unknown)";
+		boot_desc = _("(unknown)");
 
 	update_status(status_fn, status_arg, BOOT_STATUS_INFO,
-			"Booting %s.", boot_desc);
+			_("Booting %s."), boot_desc);
 
 	if (cmd && cmd->boot_image_file) {
 		image = pb_url_parse(opt, cmd->boot_image_file);
@@ -445,7 +451,7 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 	} else {
 		pb_log("%s: no image specified\n", __func__);
 		update_status(status_fn, status_arg, BOOT_STATUS_INFO,
-				"Boot failed: no image specified");
+				_("Boot failed: no image specified"));
 		return NULL;
 	}
 
@@ -480,9 +486,10 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 	  || start_url_load(boot_task, "initrd", initrd, &boot_task->initrd)
 	  || start_url_load(boot_task, "dtb", dtb, &boot_task->dtb);
 
-	/* If all URLs are local, we may be done. */
 	if (rc) {
-		talloc_free(boot_task);
+		/* Don't call boot_cancel() to preserve the status update */
+		boot_task->cancelled = true;
+		cleanup_cancellations(boot_task, NULL);
 		return NULL;
 	}
 
@@ -496,7 +503,7 @@ void boot_cancel(struct boot_task *task)
 	task->cancelled = true;
 
 	update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
-			"Boot cancelled");
+			_("Boot cancelled"));
 
 	cleanup_cancellations(task, NULL);
 }