+#include <stdbool.h>
#include <assert.h>
#include <log/log.h>
#include "paths.h"
#include "resource.h"
+struct boot_task {
+ char *local_image;
+ char *local_initrd;
+ char *local_dtb;
+ const char *args;
+
+ bool dry_run;
+};
+
/**
* kexec_load - kexec load helper.
- * @l_image: The local image file for kexec to execute.
- * @l_initrd: Optional local initrd file for kexec --initrd, can be NULL.
- * @args: Optional command line args for kexec --append, can be NULL.
*/
-
-static int kexec_load(const char *l_image, const char *l_initrd,
- const char *args, int dry_run)
+static int kexec_load(struct boot_task *boot_task)
{
int result;
- const char *argv[6];
+ const char *argv[7];
const char **p;
char *s_initrd = NULL;
+ char *s_dtb = NULL;
char *s_args = NULL;
p = argv;
*p++ = pb_system_apps.kexec; /* 1 */
*p++ = "-l"; /* 2 */
- if (l_initrd) {
- s_initrd = talloc_asprintf(NULL, "--initrd=%s", l_initrd);
+ if (boot_task->local_initrd) {
+ s_initrd = talloc_asprintf(NULL, "--initrd=%s",
+ boot_task->local_initrd);
assert(s_initrd);
*p++ = s_initrd; /* 3 */
}
- if (args) {
- s_args = talloc_asprintf(NULL, "--append=%s", args);
+ if (boot_task->local_dtb) {
+ s_dtb = talloc_asprintf(NULL, "--dtb=%s", boot_task->local_dtb);
+ assert(s_dtb);
+ *p++ = s_dtb; /* 4 */
+ }
+
+ if (boot_task->args) {
+ s_args = talloc_asprintf(NULL, "--append=%s", boot_task->args);
assert(s_args);
- *p++ = s_args; /* 4 */
+ *p++ = s_args; /* 5 */
}
- *p++ = l_image; /* 5 */
- *p++ = NULL; /* 6 */
+ *p++ = boot_task->local_image; /* 6 */
+ *p++ = NULL; /* 7 */
- result = pb_run_cmd(argv, 1, dry_run);
+ result = pb_run_cmd(argv, 1, boot_task->dry_run);
if (result)
pb_log("%s: failed: (%d)\n", __func__, result);
talloc_free(s_initrd);
+ talloc_free(s_dtb);
talloc_free(s_args);
return result;
* Must only be called after a successful call to kexec_load().
*/
-static int kexec_reboot(int dry_run)
+static int kexec_reboot(bool dry_run)
{
int result = 0;
const char *argv[4];
int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd,
int dry_run, boot_status_fn status_fn, void *status_arg)
{
- char *local_image, *local_initrd;
+ struct boot_task boot_task;
+ struct pb_url *image, *initrd, *dtb;
unsigned int clean_image = 0;
unsigned int clean_initrd = 0;
- struct pb_url *image, *initrd;
- char *args;
+ unsigned int clean_dtb = 0;
int result;
- local_initrd = NULL;
image = NULL;
initrd = NULL;
- args = NULL;
+ dtb = NULL;
+ boot_task.dry_run = dry_run;
- if (cmd->boot_image_file) {
+ if (cmd && cmd->boot_image_file) {
image = pb_url_parse(opt, cmd->boot_image_file);
} else if (opt && opt->boot_image) {
image = opt->boot_image->url;
return -1;
}
- if (cmd->initrd_file) {
+ if (cmd && cmd->initrd_file) {
initrd = pb_url_parse(opt, cmd->initrd_file);
} else if (opt && opt->initrd) {
initrd = opt->initrd->url;
}
- if (cmd->boot_args) {
- args = talloc_strdup(ctx, cmd->boot_args);
+ if (cmd && cmd->dtb_file) {
+ dtb = pb_url_parse(opt, cmd->dtb_file);
+ } else if (opt && opt->dtb) {
+ dtb = opt->dtb->url;
+ }
+
+ if (cmd && cmd->boot_args) {
+ boot_task.args = talloc_strdup(ctx, cmd->boot_args);
} else if (opt && opt->option->boot_args) {
- args = talloc_strdup(ctx, opt->option->boot_args);
+ boot_task.args = talloc_strdup(ctx, opt->option->boot_args);
+ } else {
+ boot_task.args = NULL;
}
result = -1;
update_status(status_fn, status_arg, BOOT_STATUS_INFO,
"loading kernel");
- local_image = load_url(NULL, image, &clean_image);
- if (!local_image) {
+ boot_task.local_image = load_url(NULL, image, &clean_image);
+ if (!boot_task.local_image) {
update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
"Couldn't load kernel image");
goto no_load;
}
+ boot_task.local_initrd = NULL;
if (initrd) {
update_status(status_fn, status_arg, BOOT_STATUS_INFO,
"loading initrd");
- local_initrd = load_url(NULL, initrd, &clean_initrd);
- if (!local_initrd) {
+ boot_task.local_initrd = load_url(NULL, initrd, &clean_initrd);
+ if (!boot_task.local_initrd) {
update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
"Couldn't load initrd image");
goto no_load;
}
}
+ boot_task.local_dtb = NULL;
+ if (dtb) {
+ update_status(status_fn, status_arg, BOOT_STATUS_INFO,
+ "loading device tree");
+ boot_task.local_dtb = load_url(NULL, dtb, &clean_dtb);
+ if (!boot_task.local_dtb) {
+ update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
+ "Couldn't load device tree");
+ goto no_load;
+ }
+ }
+
update_status(status_fn, status_arg, BOOT_STATUS_INFO,
"performing kexec_load");
- result = kexec_load(local_image, local_initrd, args, dry_run);
+ result = kexec_load(&boot_task);
if (result) {
update_status(status_fn, status_arg, BOOT_STATUS_ERROR,
no_load:
if (clean_image)
- unlink(local_image);
+ unlink(boot_task.local_image);
if (clean_initrd)
- unlink(local_initrd);
+ unlink(boot_task.local_initrd);
+ if (clean_dtb)
+ unlink(boot_task.local_dtb);
- talloc_free(local_image);
- talloc_free(local_initrd);
+ talloc_free(boot_task.local_image);
+ talloc_free(boot_task.local_initrd);
+ talloc_free(boot_task.local_dtb);
if (!result) {
update_status(status_fn, status_arg, BOOT_STATUS_INFO,
"performing kexec reboot");
- result = kexec_reboot(dry_run);
+ result = kexec_reboot(boot_task.dry_run);
if (result) {
update_status(status_fn, status_arg, BOOT_STATUS_ERROR,