X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=f52a91c1c8c18ee405bc0659c4d8847c1280ee99;hp=d9c606f9a5914acbf79104f1f90e79f337f2a2b3;hb=1247b4bbbbf102c0cc54f6b3a927e249a9368ba4;hpb=823958fbbd17ab2c1b2a1779eb10351ca0a668c6

diff --git a/discover/boot.c b/discover/boot.c
index d9c606f..f52a91c 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -77,7 +77,7 @@ static int kexec_load(struct boot_task *boot_task)
 	*p++ = boot_task->local_image;	/* 6 */
 	*p++ = NULL;			/* 7 */
 
-	result = pb_run_cmd(argv, 1, boot_task->dry_run);
+	result = process_run_simple_argv(boot_task, argv);
 
 	if (result)
 		pb_log("%s: failed: (%d)\n", __func__, result);
@@ -91,31 +91,18 @@ static int kexec_load(struct boot_task *boot_task)
  * Must only be called after a successful call to kexec_load().
  */
 
-static int kexec_reboot(bool dry_run)
+static int kexec_reboot(struct boot_task *task)
 {
-	int result = 0;
-	const char *argv[4];
-	const char **p;
+	int result;
 
 	/* First try running shutdown.  Init scripts should run 'exec -e' */
-
-	p = argv;
-	*p++ = pb_system_apps.shutdown;	/* 1 */
-	*p++ =  "-r";			/* 2 */
-	*p++ =  "now";			/* 3 */
-	*p++ =  NULL;			/* 4 */
-
-	result = pb_run_cmd(argv, 1, dry_run);
+	result = process_run_simple(task, pb_system_apps.shutdown, "-r",
+			"now", NULL);
 
 	/* On error, force a kexec with the -e option */
-
 	if (result) {
-		p = argv;
-		*p++ = pb_system_apps.kexec;	/* 1 */
-		*p++ = "-e";			/* 2 */
-		*p++ = NULL;			/* 3 */
-
-		result = pb_run_cmd(argv, 1, 0);
+		result = process_run_simple(task, pb_system_apps.kexec,
+						"-e", NULL);
 	}
 
 	if (result)
@@ -123,13 +110,8 @@ static int kexec_reboot(bool dry_run)
 
 	/* okay, kexec -e -f */
 	if (result) {
-		p = argv;
-		*p++ = pb_system_apps.kexec;	/* 1 */
-		*p++ = "-e";			/* 2 */
-		*p++ = "-f";			/* 3 */
-		*p++ = NULL;			/* 4 */
-
-		result = pb_run_cmd(argv, 1, 0);
+		result = process_run_simple(task, pb_system_apps.kexec,
+						"-e", "-f", NULL);
 	}
 
 	if (result)
@@ -139,17 +121,23 @@ static int kexec_reboot(bool dry_run)
 	return result;
 }
 
-static void update_status(boot_status_fn fn, void *arg, int type,
-		char *message)
+static void __attribute__((format(__printf__, 4, 5))) update_status(
+		boot_status_fn fn, void *arg, int type, char *fmt, ...)
 {
 	struct boot_status status;
+	va_list ap;
+
+	va_start(ap, fmt);
+	status.message = talloc_vasprintf(NULL, fmt, ap);
+	va_end(ap);
 
 	status.type = type;
-	status.message = message;
 	status.progress = -1;
 	status.detail = NULL;
 
 	fn(arg, &status);
+
+	talloc_free(status.message);
 }
 
 static void boot_hook_update_param(void *ctx, struct boot_task *task,
@@ -297,18 +285,31 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 	unsigned int clean_image = 0;
 	unsigned int clean_initrd = 0;
 	unsigned int clean_dtb = 0;
+	const char *boot_desc;
 	int result;
 
 	image = NULL;
 	initrd = NULL;
 	dtb = NULL;
 
+	if (opt && opt->option->name)
+		boot_desc = opt->option->name;
+	else if (cmd && cmd->boot_image_file)
+		boot_desc = cmd->boot_image_file;
+	else
+		boot_desc = "(unknown)";
+
+	update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+			"Booting %s.", boot_desc);
+
 	if (cmd && cmd->boot_image_file) {
 		image = pb_url_parse(opt, cmd->boot_image_file);
 	} else if (opt && opt->boot_image) {
 		image = opt->boot_image->url;
 	} else {
-		pb_log("%s: no image specified", __func__);
+		pb_log("%s: no image specified\n", __func__);
+		update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+				"Boot failed: no image specified");
 		return -1;
 	}
 
@@ -389,13 +390,11 @@ no_load:
 	if (clean_dtb)
 		unlink(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);
 
 		if (result) {
 			update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
@@ -403,5 +402,7 @@ no_load:
 		}
 	}
 
+	talloc_free(boot_task);
+
 	return result;
 }