X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=91fc46d642ebbc11cea7e35291c9189cddd18267;hp=7faec9fcf684027117283a4f9806f1db26be727b;hb=refs%2Ftags%2Fv1.10.2;hpb=c78f9ec47ba92b74698dacdae963dbbefd9b676f

diff --git a/discover/boot.c b/discover/boot.c
index 7faec9f..91fc46d 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -46,6 +46,7 @@ static void __attribute__((format(__printf__, 4, 5))) update_status(
 
 	status.type = type;
 	status.backlog = false;
+	status.boot_active = type == STATUS_INFO;
 
 	pb_debug("boot status: [%d] %s\n", type, status.message);
 
@@ -62,7 +63,7 @@ static int kexec_load(struct boot_task *boot_task)
 	struct process *process;
 	char *s_initrd = NULL;
 	char *s_args = NULL;
-	const char *argv[7];
+	const char *argv[8];
 	char *s_dtb = NULL;
 	const char **p;
 	int result;
@@ -107,27 +108,31 @@ static int kexec_load(struct boot_task *boot_task)
 	*p++ = pb_system_apps.kexec;	/* 1 */
 	*p++ = "-l";			/* 2 */
 
+	if (pb_log_get_debug()) {
+		*p++ = "--debug";	/* 3 */
+	}
+
 	if (local_initrd) {
 		s_initrd = talloc_asprintf(boot_task, "--initrd=%s",
 				local_initrd);
 		assert(s_initrd);
-		*p++ = s_initrd;	 /* 3 */
+		*p++ = s_initrd;	 /* 4 */
 	}
 
 	if (local_dtb) {
 		s_dtb = talloc_asprintf(boot_task, "--dtb=%s",
 						local_dtb);
 		assert(s_dtb);
-		*p++ = s_dtb;		 /* 4 */
+		*p++ = s_dtb;		 /* 5 */
 	}
 
 	s_args = talloc_asprintf(boot_task, "--append=%s",
 				boot_task->args ?: "\"\"");
 	assert(s_args);
-	*p++ = s_args;		/* 5 */
+	*p++ = s_args;			/* 6 */
 
-	*p++ = local_image;		/* 6 */
-	*p++ = NULL;			/* 7 */
+	*p++ = local_image;		/* 7 */
+	*p++ = NULL;			/* 8 */
 
 	result = process_run_sync(process);
 	if (result) {
@@ -521,25 +526,31 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 	update_status(status_fn, status_arg, STATUS_INFO,
 			_("Booting %s"), boot_desc);
 
+	boot_task = talloc_zero(ctx, struct boot_task);
+	boot_task->dry_run = dry_run;
+	boot_task->status_fn = status_fn;
+	boot_task->status_arg = status_arg;
+
 	if (cmd && cmd->boot_image_file) {
-		image = pb_url_parse(opt, cmd->boot_image_file);
+		image = pb_url_parse(boot_task, cmd->boot_image_file);
 	} else if (opt && opt->boot_image) {
 		image = opt->boot_image->url;
 	} else {
 		pb_log_fn("no image specified\n");
-		update_status(status_fn, status_arg, STATUS_INFO,
+		update_status(status_fn, status_arg, STATUS_ERROR,
 				_("Boot failed: no image specified"));
+		talloc_free(boot_task);
 		return NULL;
 	}
 
 	if (cmd && cmd->initrd_file) {
-		initrd = pb_url_parse(opt, cmd->initrd_file);
+		initrd = pb_url_parse(boot_task, cmd->initrd_file);
 	} else if (opt && opt->initrd) {
 		initrd = opt->initrd->url;
 	}
 
 	if (cmd && cmd->dtb_file) {
-		dtb = pb_url_parse(opt, cmd->dtb_file);
+		dtb = pb_url_parse(boot_task, cmd->dtb_file);
 	} else if (opt && opt->dtb) {
 		dtb = opt->dtb->url;
 	}
@@ -549,10 +560,6 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt,
 		setenv("https_proxy", opt->proxy, 1);
 	}
 
-	boot_task = talloc_zero(ctx, struct boot_task);
-	boot_task->dry_run = dry_run;
-	boot_task->status_fn = status_fn;
-	boot_task->status_arg = status_arg;
 	list_init(&boot_task->resources);
 
 	lockdown_type = lockdown_status();
@@ -581,7 +588,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, STATUS_INFO,
+			update_status(status_fn, status_arg, STATUS_ERROR,
 					_("Boot failed: no command line"
 						" signature file specified"));
 			talloc_free(boot_task);
@@ -650,7 +657,7 @@ void boot_cancel(struct boot_task *task)
 {
 	task->cancelled = true;
 
-	update_status(task->status_fn, task->status_arg, STATUS_INFO,
+	update_status(task->status_fn, task->status_arg, STATUS_ERROR,
 			_("Boot cancelled"));
 
 	cleanup_cancellations(task, NULL);