#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"
char *value)
{
const char *const *ignored_names = conf->parser_info;
+ struct device *dev;
char *pos;
char *args;
const char *initrd;
const char *root;
struct boot_option *opt;
- /* fixup for bare values */
+ /* ignore bare values */
if (!name)
return;
/* opt must be associated with dc */
- opt = talloc_zero(conf->dc->device, struct boot_option);
+ dev = conf->dc->device->device;
+ opt = talloc_zero(dev, 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", dev->id, name);
opt->name = talloc_strdup(opt, name);
args = talloc_strdup(opt, "");
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);
}
out_add:
- opt->boot_image_file = resolve_path(opt, value, conf->dc->device_path);
+ opt->boot_image_file = resolve_path(opt, value,
+ conf->dc->device->device_path);
if (root) {
opt->boot_args = talloc_asprintf(opt, "root=%s %s", root, args);
if (initrd) {
opt->initrd_file = resolve_path(opt, initrd,
- conf->dc->device_path);
+ conf->dc->device->device_path);
opt->description = talloc_asprintf(opt, "%s initrd=%s %s",
value, initrd, opt->boot_args);
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, opt);
}
static struct conf_global_option kboot_global_options[] = {
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,
return rc;
}
-define_parser(kboot, 98, kboot_parse);
+define_parser(kboot, kboot_parse);