X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fboot.c;h=5ca69b9f135f3cdbc032ccd7168311685e3adf5a;hb=c75acc64833eb7263b340079e7ba3153ebc60aec;hp=804425c65878a832ee320cf6e8b39635b4986c1b;hpb=5be946cda7b8e2271ade6188ca3f5dc068826619;p=petitboot

diff --git a/discover/boot.c b/discover/boot.c
index 804425c..5ca69b9 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -94,11 +94,39 @@ static int kexec_reboot(int dry_run)
 	if (result)
 		pb_log("%s: failed: (%d)\n", __func__, result);
 
+	/* 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);
+	}
+
+	if (result)
+		pb_log("%s: failed: (%d)\n", __func__, result);
+
+
 	return result;
 }
 
+static void update_status(boot_status_fn fn, void *arg, int type,
+		char *message)
+{
+	struct boot_status status;
+
+	status.type = type;
+	status.message = message;
+	status.progress = -1;
+	status.detail = NULL;
+
+	fn(arg, &status);
+}
+
 int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
-		int dry_run)
+		int dry_run, boot_status_fn status_fn, void *status_arg)
 {
 	char *local_image, *local_initrd;
 	unsigned int clean_image = 0;
@@ -112,7 +140,7 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 	initrd = NULL;
 	args = NULL;
 
-	if (cmd->boot_image_file) {
+	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;
@@ -121,13 +149,13 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 		return -1;
 	}
 
-	if (cmd->initrd_file) {
+	if (cmd && cmd->initrd_file) {
 		initrd = pb_url_parse(opt, cmd->initrd_file);
 	} else if (opt && opt->initrd) {
 		initrd = opt->initrd->url;
 	}
 
-	if (cmd->boot_args) {
+	if (cmd && cmd->boot_args) {
 		args = talloc_strdup(ctx, cmd->boot_args);
 	} else if (opt && opt->option->boot_args) {
 		args = talloc_strdup(ctx, opt->option->boot_args);
@@ -135,18 +163,36 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
 
 	result = -1;
 
+	update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+			"loading kernel");
 	local_image = load_url(NULL, image, &clean_image);
-	if (!local_image)
+	if (!local_image) {
+		update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
+				"Couldn't load kernel image");
 		goto no_load;
+	}
 
 	if (initrd) {
+		update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+				"loading initrd");
 		local_initrd = load_url(NULL, initrd, &clean_initrd);
-		if (!local_initrd)
+		if (!local_initrd) {
+			update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
+					"Couldn't load initrd image");
 			goto no_load;
+		}
 	}
 
+	update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+			"performing kexec_load");
+
 	result = kexec_load(local_image, local_initrd, args, dry_run);
 
+	if (result) {
+		update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
+				"kexec load failed");
+	}
+
 no_load:
 	if (clean_image)
 		unlink(local_image);
@@ -156,8 +202,17 @@ no_load:
 	talloc_free(local_image);
 	talloc_free(local_initrd);
 
-	if (!result)
+	if (!result) {
+		update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+				"performing kexec reboot");
+
 		result = kexec_reboot(dry_run);
 
+		if (result) {
+			update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
+					"kexec reboot failed");
+		}
+	}
+
 	return result;
 }