X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=82fba2f1da39279696a2564680904f780c6634e9;hp=dc6da7d5254d9a3b420cd01ed698f2a0af1053ee;hb=f59937ad2d75b89d5e5129717f28338d26bae3c7;hpb=d9e70bb63227a683f808a21be20b3d5e1a474f95

diff --git a/discover/boot.c b/discover/boot.c
index dc6da7d..82fba2f 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -146,7 +146,7 @@ static int kexec_reboot(struct boot_task *task)
 static void __attribute__((format(__printf__, 4, 5))) update_status(
 		boot_status_fn fn, void *arg, int type, char *fmt, ...)
 {
-	struct boot_status status;
+	struct status status;
 	va_list ap;
 
 	va_start(ap, fmt);
@@ -154,8 +154,6 @@ static void __attribute__((format(__printf__, 4, 5))) update_status(
 	va_end(ap);
 
 	status.type = type;
-	status.progress = -1;
-	status.detail = NULL;
 
 	pb_debug("boot status: [%d] %s\n", type, status.message);
 
@@ -252,8 +250,8 @@ static void run_boot_hooks(struct boot_task *task)
 	if (n < 1)
 		return;
 
-	update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
-			_("running boot hooks"));
+	update_status(task->status_fn, task->status_arg, STATUS_INFO,
+			_("Running boot hooks"));
 
 	boot_hook_setenv(task);
 
@@ -311,12 +309,19 @@ static int check_load(struct boot_task *task, const char *name,
 {
 	if (!result)
 		return 0;
-	if (result->status != LOAD_ERROR)
+
+	if (result->status != LOAD_ERROR) {
+		update_status(task->status_fn, task->status_arg,
+				STATUS_ERROR,
+				_("Loaded %s from %s"), name,
+				pb_url_to_string(result->url));
 		return 0;
+	}
 
 	update_status(task->status_fn, task->status_arg,
-			BOOT_STATUS_ERROR,
-			_("Couldn't load %s"), name);
+			STATUS_ERROR,
+			_("Couldn't load %s from %s"), name,
+			pb_url_to_string(result->url));
 	return -1;
 }
 
@@ -443,28 +448,27 @@ 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"));
+	update_status(task->status_fn, task->status_arg, STATUS_INFO,
+			_("Performing kexec load"));
 
 	rc = kexec_load(task);
 	if (rc == KEXEC_LOAD_DECRYPTION_FALURE) {
 		update_status(task->status_fn, task->status_arg,
-				BOOT_STATUS_ERROR, _("decryption failed"));
+				STATUS_ERROR, _("Decryption failed"));
 	}
 	else if (rc == KEXEC_LOAD_SIGNATURE_FAILURE) {
 		update_status(task->status_fn, task->status_arg,
-				BOOT_STATUS_ERROR,
-				_("signature verification failed"));
+				STATUS_ERROR,
+				_("Signature verification failed"));
 	}
 	else if (rc == KEXEC_LOAD_SIG_SETUP_INVALID) {
 		update_status(task->status_fn, task->status_arg,
-				BOOT_STATUS_ERROR,
-				_("invalid signature configuration"));
+				STATUS_ERROR,
+				_("Invalid signature configuration"));
 	}
 	else if (rc) {
 		update_status(task->status_fn, task->status_arg,
-				BOOT_STATUS_ERROR,
-				_("kexec load failed"));
+				STATUS_ERROR, _("kexec load failed"));
 	}
 
 no_sig_load:
@@ -482,13 +486,12 @@ no_load:
 
 	if (!rc) {
 		update_status(task->status_fn, task->status_arg,
-				BOOT_STATUS_INFO,
-				_("performing kexec reboot"));
+				STATUS_INFO, _("Performing kexec reboot"));
 
 		rc = kexec_reboot(task);
 		if (rc) {
 			update_status(task->status_fn, task->status_arg,
-					BOOT_STATUS_ERROR,
+					STATUS_ERROR,
 					_("kexec reboot failed"));
 		}
 	}
@@ -503,8 +506,7 @@ static int start_url_load(struct boot_task *task, const char *name,
 	*result = load_url_async(task, url, boot_process, task);
 	if (!*result) {
 		update_status(task->status_fn, task->status_arg,
-				BOOT_STATUS_ERROR,
-				_("Error loading %s"), name);
+				STATUS_ERROR, _("Error loading %s"), name);
 		return -1;
 	}
 	return 0;
@@ -530,8 +532,8 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 	else
 		boot_desc = _("(unknown)");
 
-	update_status(status_fn, status_arg, BOOT_STATUS_INFO,
-			_("Booting %s."), boot_desc);
+	update_status(status_fn, status_arg, STATUS_INFO,
+			_("Booting %s"), boot_desc);
 
 	if (cmd && cmd->boot_image_file) {
 		image = pb_url_parse(opt, cmd->boot_image_file);
@@ -539,7 +541,7 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 		image = opt->boot_image->url;
 	} else {
 		pb_log("%s: no image specified\n", __func__);
-		update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+		update_status(status_fn, status_arg, STATUS_INFO,
 				_("Boot failed: no image specified"));
 		return NULL;
 	}
@@ -587,7 +589,7 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 		} else {
 			pb_log("%s: no command line signature file"
 				" specified\n", __func__);
-			update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+			update_status(status_fn, status_arg, STATUS_INFO,
 					_("Boot failed: no command line"
 						" signature file specified"));
 			talloc_free(boot_task);
@@ -596,33 +598,34 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 	}
 
 	/* start async loads for boot resources */
-	rc = start_url_load(boot_task, "kernel image", image, &boot_task->image)
-	  || start_url_load(boot_task, "initrd", initrd, &boot_task->initrd)
-	  || start_url_load(boot_task, "dtb", dtb, &boot_task->dtb);
+	rc = start_url_load(boot_task, _("kernel image"),
+			image, &boot_task->image)
+	  || start_url_load(boot_task, _("initrd"), initrd, &boot_task->initrd)
+	  || start_url_load(boot_task, _("dtb"), dtb, &boot_task->dtb);
 
 	if (boot_task->verify_signature) {
 		/* Generate names of associated signature files and load */
 		if (image) {
 			image_sig = gpg_get_signature_url(ctx, image);
 			rc |= start_url_load(boot_task,
-				"kernel image signature", image_sig,
+				_("kernel image signature"), image_sig,
 				&boot_task->image_signature);
 		}
 		if (initrd) {
 			initrd_sig = gpg_get_signature_url(ctx, initrd);
-			rc |= start_url_load(boot_task, "initrd signature",
+			rc |= start_url_load(boot_task, _("initrd signature"),
 				initrd_sig, &boot_task->initrd_signature);
 		}
 		if (dtb) {
 			dtb_sig = gpg_get_signature_url(ctx, dtb);
-			rc |= start_url_load(boot_task, "dtb signature",
+			rc |= start_url_load(boot_task, _("dtb signature"),
 				dtb_sig, &boot_task->dtb_signature);
 		}
 	}
 
 	if (boot_task->verify_signature || boot_task->decrypt_files) {
 		rc |= start_url_load(boot_task,
-			"kernel command line signature", cmdline_sig,
+			_("kernel command line signature"), cmdline_sig,
 			&boot_task->cmdline_signature);
 	}
 
@@ -643,7 +646,7 @@ void boot_cancel(struct boot_task *task)
 {
 	task->cancelled = true;
 
-	update_status(task->status_fn, task->status_arg, BOOT_STATUS_INFO,
+	update_status(task->status_fn, task->status_arg, STATUS_INFO,
 			_("Boot cancelled"));
 
 	cleanup_cancellations(task, NULL);