X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=7faec9fcf684027117283a4f9806f1db26be727b;hp=1e010ab1ebc316e6a13a0ef588abe4ff9ed9330d;hb=c78f9ec47ba92b74698dacdae963dbbefd9b676f;hpb=dc85de97c79c2172a87fc95cca16e6c6055dc1f4 diff --git a/discover/boot.c b/discover/boot.c index 1e010ab..7faec9f 100644 --- a/discover/boot.c +++ b/discover/boot.c @@ -26,7 +26,7 @@ #include "resource.h" #include "platform.h" -#include +#include static const char *boot_hook_dir = PKG_SYSCONF_DIR "/boot.d"; enum { @@ -72,17 +72,17 @@ static int kexec_load(struct boot_task *boot_task) boot_task->local_dtb_override = NULL; boot_task->local_image_override = NULL; - if ((result = gpg_validate_boot_files(boot_task))) { + if ((result = validate_boot_files(boot_task))) { if (result == KEXEC_LOAD_DECRYPTION_FALURE) { pb_log("%s: Aborting kexec due to" " decryption failure\n", __func__); - goto abort_kexec; } if (result == KEXEC_LOAD_SIGNATURE_FAILURE) { pb_log("%s: Aborting kexec due to signature" " verification failure\n", __func__); - goto abort_kexec; } + + goto abort_kexec; } const char* local_initrd = (boot_task->local_initrd_override) ? @@ -94,7 +94,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; } @@ -131,20 +131,20 @@ static int kexec_load(struct boot_task *boot_task) 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); } abort_kexec: - gpg_validate_boot_files_cleanup(boot_task); + validate_boot_files_cleanup(boot_task); return result; } @@ -170,7 +170,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 +179,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 +341,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, @@ -362,15 +364,14 @@ static void cleanup_load(struct load_url_result *result) static void cleanup_cancellations(struct boot_task *task, struct load_url_result *cur_result) { - struct load_url_result *result, **results[] = { - &task->image, &task->initrd, &task->dtb, - }; + struct boot_resource *resource; + struct load_url_result *result; bool pending = false; - unsigned int i; - for (i = 0; i < ARRAY_SIZE(results); i++) { - result = *results[i]; + list_for_each_entry(&task->resources, resource, list) { + result = resource->result; + /* Nothing to do if a load hasn't actually started yet */ if (!result) continue; @@ -378,9 +379,6 @@ static void cleanup_cancellations(struct boot_task *task, if (result == cur_result || result->status == LOAD_OK || result->status == LOAD_ERROR) { cleanup_load(result); - talloc_free(result); - *results[i] = NULL; - /* ... and cancel any pending loads, which we'll free in * the completion callback */ } else if (result->status == LOAD_ASYNC) { @@ -425,7 +423,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")); @@ -455,6 +453,8 @@ no_load: STATUS_ERROR, _("kexec reboot failed")); } + } else { + pb_log("Failed to load all boot resources\n"); } } @@ -466,6 +466,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); @@ -524,7 +526,7 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt, } else if (opt && opt->boot_image) { image = opt->boot_image->url; } else { - pb_log("%s: no image specified\n", __func__); + pb_log_fn("no image specified\n"); update_status(status_fn, status_arg, STATUS_INFO, _("Boot failed: no image specified")); return NULL; @@ -602,21 +604,21 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt, if (boot_task->verify_signature) { /* Generate names of associated signature files and load */ if (image) { - image_sig = gpg_get_signature_url(ctx, image); + image_sig = get_signature_url(ctx, image); tmp = add_boot_resource(boot_task, _("kernel image signature"), image_sig, &boot_task->local_image_signature); rc |= start_url_load(boot_task, tmp); } if (initrd) { - initrd_sig = gpg_get_signature_url(ctx, initrd); + initrd_sig = get_signature_url(ctx, initrd); tmp = add_boot_resource(boot_task, _("initrd signature"), initrd_sig, &boot_task->local_initrd_signature); rc |= start_url_load(boot_task, tmp); } if (dtb) { - dtb_sig = gpg_get_signature_url(ctx, dtb); + dtb_sig = get_signature_url(ctx, dtb); tmp = add_boot_resource(boot_task, _("dtb signature"), dtb_sig, &boot_task->local_dtb_signature);