summaryrefslogtreecommitdiffstats
path: root/discover/boot.c
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-05-01 09:56:54 +0800
committerJeremy Kerr <jk@ozlabs.org>2013-05-06 09:02:12 +0800
commit375c81a1b9aa8904dfdd0b1195fe99a1e4a2fa9d (patch)
treeb191cbbb4a36af487aaedc24572af6fadf481b24 /discover/boot.c
parenteefe357750df147359aa7ff532343a9b59341ef1 (diff)
downloadtalos-petitboot-375c81a1b9aa8904dfdd0b1195fe99a1e4a2fa9d.tar.gz
talos-petitboot-375c81a1b9aa8904dfdd0b1195fe99a1e4a2fa9d.zip
discover: Send boot status messages during boot()
Now what we have protocol support, send status updates during the boot process. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/boot.c')
-rw-r--r--discover/boot.c48
1 files changed, 44 insertions, 4 deletions
diff --git a/discover/boot.c b/discover/boot.c
index 804425c..d054d5d 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -97,8 +97,21 @@ static int kexec_reboot(int dry_run)
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;
@@ -135,18 +148,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 +187,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;
}
OpenPOWER on IntegriCloud