X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fkboot-parser.c;h=e4b36b624a3b5bf376542a3525eb907bb844ee02;hp=9d0322de39280e0f66a28ad9f783c419afbc12ae;hb=ec07742d2a37f8f96705fc0f20d9b22b583dad57;hpb=c11bcba9a99e858e618f4d872a5be7d52dcaaa5a

diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c
index 9d0322d..e4b36b6 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"
@@ -94,6 +97,12 @@ 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);
@@ -136,10 +145,14 @@ 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
 };
 
@@ -151,33 +164,57 @@ 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;
+	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->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;
 
-	conf_parse_buf(conf, buf, len);
+		if (!parser_is_unique(dc, dc->device, *filename, found_list))
+			continue;
+
+		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,
 };