X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=04c32a188414e4f59f14285d72f87f32f35b2798;hp=0da40e3d8f4b11d6f13b20c2147ef5a3dfd521a3;hb=0dca9e11c5bacd76a12b2e52a263ca7bd94b9a00;hpb=c208aa42024fddc74682742bec12735e432a5510

diff --git a/discover/boot.c b/discover/boot.c
index 0da40e3..04c32a1 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -26,7 +26,7 @@
 #include "resource.h"
 #include "platform.h"
 
-#include <security/gpg.h>
+#include <security/security.h>
 
 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) ?
@@ -144,7 +144,7 @@ static int kexec_load(struct boot_task *boot_task)
 	}
 
 abort_kexec:
-	gpg_validate_boot_files_cleanup(boot_task);
+	validate_boot_files_cleanup(boot_task);
 
 	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,
@@ -451,6 +453,8 @@ no_load:
 					STATUS_ERROR,
 					_("kexec reboot failed"));
 		}
+	} else {
+		pb_log("Failed to load all boot resources\n");
 	}
 }
 
@@ -462,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);
@@ -598,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);