From: Jeremy Kerr Date: Mon, 23 Sep 2013 09:34:14 +0000 (+0800) Subject: discover/boot: Add booting status message X-Git-Tag: v1.0.0~480 X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=7f1729734336f78ce227a0440c1a2957ac94fb91;ds=sidebyside discover/boot: Add booting status message Signed-off-by: Jeremy Kerr --- diff --git a/discover/boot.c b/discover/boot.c index 6095cd8..f52a91c 100644 --- a/discover/boot.c +++ b/discover/boot.c @@ -285,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\n", __func__); + update_status(status_fn, status_arg, BOOT_STATUS_INFO, + "Boot failed: no image specified"); return -1; }