From: Jeremy Kerr <jk@ozlabs.org>
Date: Mon, 7 Jan 2008 10:42:45 +0000 (+1100)
Subject: Add kexec argument logging
X-Git-Tag: v1.0.0~967
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=bcabb75250c6562ecdf20fdd0c73cbb590a1dd7f;p=petitboot

Add kexec argument logging

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---

diff --git a/devices.c b/devices.c
index e4d6913..3779810 100644
--- a/devices.c
+++ b/devices.c
@@ -282,9 +282,9 @@ void pboot_exec_option(void *data)
 {
 	struct boot_option *opt = data;
 	char *kexec_opts[10];
-	int nr_opts = 2;
+	int i, nr_opts = 2;
 
-	kexec_opts[0] = "/sbin/kexec";
+	kexec_opts[0] = "/usr/sbin/kexec";
 	kexec_opts[1] = "-f";
 	if (opt->initrd_file) {
 		kexec_opts[nr_opts] = malloc(10 + strlen(opt->initrd_file));
@@ -300,5 +300,14 @@ void pboot_exec_option(void *data)
 
 	kexec_opts[nr_opts++] = opt->boot_image_file;
 	kexec_opts[nr_opts] = NULL;
+
+	LOG("calling kexec:\n");
+	for (i = 0; i < nr_opts; i++) {
+		LOG("\t'%s'\n", kexec_opts[i]);
+	}
+	fflush(stdout);
+
 	execv(kexec_opts[0], kexec_opts);
+
+	LOG("kexec failed: %s", strerror(errno));
 }