X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fkboot-parser.c;h=bf9c5eb2fe98f5f59056cad85f47e018cb31a674;hp=4b4c2f7b49b9404ab67ecdd0e5fbb7ba4456a580;hb=7e0b9da2ae2f96d24c711c0ad4d12bb193ec49c0;hpb=1b50985db4e85030de3567792aedc13aa26e0fea

diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c
index 4b4c2f7..bf9c5eb 100644
--- a/discover/kboot-parser.c
+++ b/discover/kboot-parser.c
@@ -1,8 +1,11 @@
-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <i18n/i18n.h>
 
 #include "log/log.h"
 #include "talloc/talloc.h"
@@ -21,6 +24,7 @@ static void kboot_process_pair(struct conf_context *conf, const char *name,
 	char *args;
 	const char *initrd;
 	const char *root;
+	const char *dtb;
 
 	/* ignore bare values */
 
@@ -50,6 +54,7 @@ static void kboot_process_pair(struct conf_context *conf, const char *name,
 	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, ' ');
 
@@ -79,6 +84,11 @@ 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);
 	}
@@ -87,21 +97,34 @@ out_add:
 	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);
 		talloc_free(args);
 	} else
 		opt->boot_args = args;
 
+	opt->description = talloc_asprintf(opt, "%s %s", value,
+			opt->boot_args);
+
 	if (initrd) {
 		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);
@@ -110,6 +133,7 @@ out_add:
 }
 
 static struct conf_global_option kboot_global_options[] = {
+	{ .name = "dtb" },
 	{ .name = "initrd" },
 	{ .name = "root" },
 	{ .name = "video" },
@@ -136,33 +160,48 @@ static const char *const kboot_ignored_names[] = {
 	NULL
 };
 
-static int kboot_parse(struct discover_context *dc, char *buf, int len)
+static int kboot_parse(struct discover_context *dc)
 {
 	struct conf_context *conf;
+	const char * const *filename;
+	char *buf;
+	int len, rc;
+
+	/* 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;
 
 	conf->dc = dc;
 	conf->global_options = kboot_global_options,
 	conf_init_global_options(conf);
 	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;
 
-	conf_parse_buf(conf, buf, len);
+	for (filename = kboot_conf_files; *filename; filename++) {
+		rc = parser_request_file(dc, dc->device, *filename, &buf, &len);
+		if (rc)
+			continue;
+
+		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 1;
+	return 0;
 }
 
 static struct parser kboot_parser = {
 	.name			= "kboot",
-	.method			= CONF_METHOD_LOCAL_FILE,
 	.parse			= kboot_parse,
-	.filenames		= kboot_conf_files,
 	.resolve_resource	= resolve_devpath_resource,
 };