#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 device *dev;
+ 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;
/* ignore bare values */
/* opt must be associated with dc */
- dev = conf->dc->device->device;
- opt = talloc_zero(dev, 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", dev->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, ' ');
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->device_path);
+ d_opt->boot_image = create_devpath_resource(d_opt,
+ conf->dc->device, value);
if (root) {
opt->boot_args = talloc_asprintf(opt, "root=%s %s", root, args);
} 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->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);
+ }
conf_strip_str(opt->boot_args);
conf_strip_str(opt->description);
- discover_context_add_boot_option(conf->dc, 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" },
NULL
};
-static int kboot_parse(struct discover_context *dc)
+static int kboot_parse(struct discover_context *dc, char *buf, int len)
{
struct conf_context *conf;
- int rc;
conf = talloc_zero(dc, struct conf_context);
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,
- rc = conf_parse(conf);
+ conf_parse_buf(conf, buf, len);
talloc_free(conf);
- return rc;
+ return 1;
}
-define_parser(kboot, kboot_parse);
+static struct parser kboot_parser = {
+ .name = "kboot",
+ .method = CONF_METHOD_LOCAL_FILE,
+ .parse = kboot_parse,
+ .filenames = kboot_conf_files,
+ .resolve_resource = resolve_devpath_resource,
+};
+
+register_parser(kboot_parser);