X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=devices.c;h=37798105d58d87528b252833955df332324de04c;hp=e4d6913875b6025f7f6a22ec685e861cb766c744;hb=bcabb75250c6562ecdf20fdd0c73cbb590a1dd7f;hpb=e8a3e2b1629824cb01c95e2a49b8f31152c0edd2 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)); }