X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fkboot-parser.c;h=4c68cd4dc812c784ab0ea671b813a6392e6bfa42;hp=025f13b6afa1bd8e32606da013f6dc2a15f4f667;hb=9e869ebe3a5127575105d82c4d289d95cbed2db9;hpb=7c5e552c210b38a06ed9fbb99418b62e20978666 diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c index 025f13b..4c68cd4 100644 --- a/discover/kboot-parser.c +++ b/discover/kboot-parser.c @@ -1,27 +1,32 @@ -#define _GNU_SOURCE +#if defined(HAVE_CONFIG_H) +#include "config.h" +#endif #include #include #include +#include #include "log/log.h" #include "talloc/talloc.h" -#include "pb-protocol/pb-protocol.h" +#include "types/types.h" #include "parser-conf.h" #include "parser-utils.h" -#include "paths.h" +#include "resource.h" static void kboot_process_pair(struct conf_context *conf, const char *name, char *value) { const char *const *ignored_names = conf->parser_info; + struct discover_boot_option *d_opt; + struct boot_option *opt; char *pos; char *args; const char *initrd; const char *root; - struct boot_option *opt; + const char *dtb; - /* fixup for bare values */ + /* ignore bare values */ if (!name) return; @@ -34,17 +39,22 @@ static void kboot_process_pair(struct conf_context *conf, const char *name, /* opt must be associated with dc */ - opt = talloc_zero(conf->dc->device, struct boot_option); + d_opt = talloc_zero(conf->dc, struct discover_boot_option); + d_opt->device = conf->dc->device; + opt = talloc_zero(d_opt, struct boot_option); if (!opt) return; - opt->id = talloc_asprintf(opt, "%s#%s", conf->dc->device->id, name); + opt->id = talloc_asprintf(opt, "%s#%s", conf->dc->device->device->id, + name); opt->name = talloc_strdup(opt, name); + d_opt->option = opt; args = talloc_strdup(opt, ""); initrd = conf_get_global_option(conf, "initrd"); root = conf_get_global_option(conf, "root"); + dtb = conf_get_global_option(conf, "dtb"); pos = strchr(value, ' '); @@ -57,7 +67,7 @@ static void kboot_process_pair(struct conf_context *conf, const char *name, for (pos++; pos;) { char *cl_name, *cl_value; - pos = conf_get_param_pair(pos, &cl_name, &cl_value, ' '); + pos = conf_get_pair_equal(conf, pos, &cl_name, &cl_value, ' '); if (!cl_name) { args = talloc_asprintf_append(args, "%s ", cl_value); @@ -74,12 +84,24 @@ static void kboot_process_pair(struct conf_context *conf, const char *name, continue; } + if (streq(cl_name, "dtb")) { + dtb = cl_value; + continue; + } + args = talloc_asprintf_append(args, "%s=%s ", cl_name, cl_value); } out_add: - opt->boot_image_file = resolve_path(opt, value, conf->dc->device_path); + d_opt->boot_image = create_devpath_resource(d_opt, + conf->dc->device, value); + + char* args_sigfile_default = talloc_asprintf(d_opt, + "%s.cmdline.sig", value); + d_opt->args_sig_file = create_devpath_resource(d_opt, + conf->dc->device, args_sigfile_default); + talloc_free(args_sigfile_default); if (root) { opt->boot_args = talloc_asprintf(opt, "root=%s %s", root, args); @@ -87,26 +109,39 @@ out_add: } else opt->boot_args = args; + opt->description = talloc_asprintf(opt, "%s %s", value, + opt->boot_args); + if (initrd) { - opt->initrd_file = resolve_path(opt, initrd, - conf->dc->device_path); + d_opt->initrd = create_devpath_resource(d_opt, + conf->dc->device, initrd); + opt->description = talloc_asprintf_append(opt->description, + " initrd=%s", initrd); + } - opt->description = talloc_asprintf(opt, "%s initrd=%s %s", - value, initrd, opt->boot_args); - } else - opt->description = talloc_asprintf(opt, "%s %s", value, - opt->boot_args); + if (dtb) { + d_opt->dtb = create_devpath_resource(d_opt, + conf->dc->device, dtb); + opt->description = talloc_asprintf_append(opt->description, + " dtb=%s", dtb); + } + + if (conf_get_global_option(conf, "default")) + opt->is_default = streq(opt->name, + conf_get_global_option(conf, "default")); conf_strip_str(opt->boot_args); conf_strip_str(opt->description); - device_add_boot_option(conf->dc->device, opt); + discover_context_add_boot_option(conf->dc, d_opt); } static struct conf_global_option kboot_global_options[] = { + { .name = "dtb" }, { .name = "initrd" }, { .name = "root" }, { .name = "video" }, + { .name = "default" }, { .name = NULL } }; @@ -115,15 +150,18 @@ static const char *const kboot_conf_files[] = { "/kboot.cnf", "/etc/kboot.conf", "/etc/kboot.cnf", + "/boot/kboot.conf", + "/boot/kboot.cnf", "/KBOOT.CONF", "/KBOOT.CNF", "/ETC/KBOOT.CONF", "/ETC/KBOOT.CNF", + "/BOOT/KBOOT.CONF", + "/BOOT/KBOOT.CNF", NULL }; static const char *const kboot_ignored_names[] = { - "default", "delay", "message", "timeout", @@ -133,24 +171,55 @@ static const char *const kboot_ignored_names[] = { static int kboot_parse(struct discover_context *dc) { struct conf_context *conf; - int rc; + struct list *found_list; + const char * const *filename; - conf = talloc_zero(dc, struct conf_context); + /* Support block device boot only at present */ + if (dc->event) + return -1; + conf = talloc_zero(dc, struct conf_context); if (!conf) - return 0; + return -1; + + found_list = talloc(conf, struct list); + if (!found_list) + return -1; + list_init(found_list); conf->dc = dc; conf->global_options = kboot_global_options, conf_init_global_options(conf); - conf->conf_files = kboot_conf_files, + conf->get_pair = conf_get_pair_equal; conf->process_pair = kboot_process_pair; - conf->parser_info = (void *)kboot_ignored_names, + conf->parser_info = (void *)kboot_ignored_names; + + for (filename = kboot_conf_files; *filename; filename++) { + int len, rc; + char *buf; + + if (!parser_is_unique(dc, dc->device, *filename, found_list)) + continue; + + rc = parser_request_file(dc, dc->device, *filename, &buf, &len); + if (rc) + continue; - rc = conf_parse(conf); + conf_parse_buf(conf, buf, len); + device_handler_status_dev_info(dc->handler, dc->device, + _("Parsed kboot configuration from %s"), + *filename); + talloc_free(buf); + } talloc_free(conf); - return rc; + return 0; } -define_parser(kboot, kboot_parse); +static struct parser kboot_parser = { + .name = "kboot", + .parse = kboot_parse, + .resolve_resource = resolve_devpath_resource, +}; + +register_parser(kboot_parser);