X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fkboot-parser.c;h=62512cf9334b1395eb936376a937a3f04c8e0ce6;hp=8572674b982a94f1b49395cb3d504cf67f3f3879;hb=41d6eba200ada2ae28f7f016b62eee65b59fab71;hpb=b8e53cb4b96eb17dc7fa0ffc505dfebae37e6cbf

diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c
index 8572674..62512cf 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
 };
 
@@ -180,6 +193,9 @@ static int kboot_parse(struct discover_context *dc)
 			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);
 	}