X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fboot.c;h=8c2e8e19607d1ff056479e084f58c6d958a5be9c;hp=5ca69b9f135f3cdbc032ccd7168311685e3adf5a;hb=e9fd07f945135224708253845a2fa08943755b53;hpb=b3539f1cf27f0cd1ddf26ec92d9ea4e6c0df7ea5 diff --git a/discover/boot.c b/discover/boot.c index 5ca69b9..8c2e8e1 100644 --- a/discover/boot.c +++ b/discover/boot.c @@ -1,5 +1,13 @@ +#define _GNU_SOURCE + +#include +#include #include +#include +#include +#include +#include #include #include @@ -12,47 +20,62 @@ #include "paths.h" #include "resource.h" +static const char *boot_hook_dir = PKG_SYSCONF_DIR "/boot.d"; + +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; @@ -64,7 +87,7 @@ static int kexec_load(const char *l_image, const char *l_initrd, * 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]; @@ -125,20 +148,72 @@ static void update_status(boot_status_fn fn, void *arg, int type, fn(arg, &status); } +static int hook_filter(const struct dirent *dirent) +{ + return dirent->d_type == DT_REG || dirent->d_type == DT_LNK; +} + +static int hook_cmp(const struct dirent **a, const struct dirent **b) +{ + return strcmp((*a)->d_name, (*b)->d_name); +} + +static void run_boot_hooks(void *ctx, struct boot_task *task, + boot_status_fn status_fn, void *status_arg) +{ + struct dirent **hooks; + int i, n; + + n = scandir(boot_hook_dir, &hooks, hook_filter, hook_cmp); + if (n < 1) + return; + + update_status(status_fn, status_arg, BOOT_STATUS_INFO, + "running boot hooks"); + + /* pass boot data to hooks */ + setenv("boot_image", task->local_image, 1); + if (task->local_initrd) + setenv("boot_initrd", task->local_initrd, 1); + if (task->local_dtb) + setenv("boot_dtb", task->local_dtb, 1); + if (task->args) + setenv("boot_args", task->args, 1); + + for (i = 0; i < n; i++) { + char *path; + const char *argv[2] = { NULL, NULL }; + + path = join_paths(ctx, boot_hook_dir, hooks[i]->d_name); + + if (access(path, X_OK)) + continue; + + pb_log("running boot hook %s\n", hooks[i]->d_name); + + argv[0] = path; + pb_run_cmd(argv, 1, task->dry_run); + + talloc_free(path); + } + + free(hooks); +} + 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 && cmd->boot_image_file) { image = pb_url_parse(opt, cmd->boot_image_file); @@ -155,38 +230,61 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd, initrd = opt->initrd->url; } + 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) { - args = talloc_strdup(ctx, 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; + } + } + + run_boot_hooks(ctx, &boot_task, status_fn, status_arg); + 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, @@ -195,18 +293,21 @@ int boot(void *ctx, struct discover_boot_option *opt, struct boot_command *cmd, 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,