X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=91fc46d642ebbc11cea7e35291c9189cddd18267;hp=2a0d333a4ea7bad7c9249764f119767c2228a0ba;hb=f583f0cf35fc227db5f73ecd04daf7702735b740;hpb=902ee86b042444a91e7122b56a204749d297d59d diff --git a/discover/boot.c b/discover/boot.c index 2a0d333..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; @@ -94,7 +95,7 @@ static int kexec_load(struct boot_task *boot_task) process = process_create(boot_task); if (!process) { - pb_log("%s: failed to create process\n", __func__); + pb_log_fn("failed to create process\n"); return -1; } @@ -107,38 +108,42 @@ 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) { - pb_log("%s: failed to run process\n", __func__); + pb_log_fn("failed to run process\n"); goto abort_kexec; } result = process->exit_status; if (result) { - pb_log("%s: failed: (%d)\n", __func__, result); + pb_log_fn("failed: (%d)\n", result); update_status(boot_task->status_fn, boot_task->status_arg, STATUS_ERROR, "%s", process->stdout_buf); } @@ -170,7 +175,7 @@ static int kexec_reboot(struct boot_task *task) } if (result) - pb_log("%s: failed: (%d)\n", __func__, result); + pb_log_fn("failed: (%d)\n", result); /* okay, kexec -e -f */ if (result) { @@ -179,7 +184,7 @@ static int kexec_reboot(struct boot_task *task) } if (result) - pb_log("%s: failed: (%d)\n", __func__, result); + pb_log_fn("failed: (%d)\n", result); return result; @@ -341,6 +346,8 @@ static int check_load(struct boot_task *task, const char *name, return 0; } + pb_log("Failed to load %s from %s\n", name, + pb_url_to_string(result->url)); update_status(task->status_fn, task->status_arg, STATUS_ERROR, _("Couldn't load %s from %s"), name, @@ -421,7 +428,7 @@ static void boot_process(struct load_url_result *result, void *data) _("Performing kexec load")); rc = kexec_load(task); - pb_log("%s: kexec_load returned %d\n", __func__, rc); + pb_log_fn("kexec_load returned %d\n", rc); if (rc == KEXEC_LOAD_DECRYPTION_FALURE) { update_status(task->status_fn, task->status_arg, STATUS_ERROR, _("Decryption failed")); @@ -451,6 +458,8 @@ no_load: STATUS_ERROR, _("kexec reboot failed")); } + } else { + pb_log("Failed to load all boot resources\n"); } } @@ -462,6 +471,8 @@ static int start_url_load(struct boot_task *task, struct boot_resource *res) res->result = load_url_async(task, res->url, boot_process, task, NULL, task->status_arg); if (!res->result) { + pb_log("Error starting load for %s at %s\n", + res->name, pb_url_to_string(res->url)); update_status(task->status_fn, task->status_arg, STATUS_ERROR, _("Error loading %s"), res->name); @@ -515,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("%s: no image specified\n", __func__); - update_status(status_fn, status_arg, STATUS_INFO, + pb_log_fn("no image specified\n"); + 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; } @@ -543,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(); @@ -575,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); @@ -644,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);