X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=7faec9fcf684027117283a4f9806f1db26be727b;hp=2a0d333a4ea7bad7c9249764f119767c2228a0ba;hb=c78f9ec47ba92b74698dacdae963dbbefd9b676f;hpb=902ee86b042444a91e7122b56a204749d297d59d

diff --git a/discover/boot.c b/discover/boot.c
index 2a0d333..7faec9f 100644
--- a/discover/boot.c
+++ b/discover/boot.c
@@ -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,14 +131,14 @@ 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);
 	}
@@ -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,
@@ -421,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"));
@@ -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);
@@ -520,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;