X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fkboot-parser.c;h=5d5090b46003c509c666b10584b2a996eddcd9a4;hp=e688c22d512fde7bf91736ba7808f38fd52f3c4c;hb=359f12f9eb0440294a8be1b78ade1b69926d2896;hpb=5472ed16df5642aedc124a1b49a35d99da98cc37

diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c
index e688c22..5d5090b 100644
--- a/discover/kboot-parser.c
+++ b/discover/kboot-parser.c
@@ -6,7 +6,7 @@
 
 #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"
@@ -15,12 +15,18 @@ 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;
 	char *pos;
 	char *args;
 	const char *initrd;
 	const char *root;
 	struct boot_option *opt;
 
+	/* ignore bare values */
+
+	if (!name)
+		return;
+
 	if (conf_param_in_list(ignored_names, name))
 		return;
 
@@ -29,12 +35,13 @@ 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);
+	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, "");
@@ -52,7 +59,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,7 +81,8 @@ static void kboot_process_pair(struct conf_context *conf, const char *name,
 	}
 
 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);
@@ -84,7 +92,7 @@ out_add:
 
 	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);
@@ -95,7 +103,7 @@ out_add:
 	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[] = {
@@ -133,11 +141,13 @@ static int kboot_parse(struct discover_context *dc)
 	conf = talloc_zero(dc, struct conf_context);
 
 	if (!conf)
-		return -1;
+		return 0;
 
 	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,
 
@@ -147,4 +157,4 @@ static int kboot_parse(struct discover_context *dc)
 	return rc;
 }
 
-define_parser(kboot, 98, kboot_parse);
+define_parser(kboot, kboot_parse);