X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fyaboot-parser.c;h=b06248f535f35eb0c05b3e2bf2437a1516cafbdf;hp=4dd1ea5be9648214f7a14b64b837839723fb9e60;hb=336f4eb17fb50526ea9fda82262356581e1b9ae0;hpb=e900b77853c4d890e3d173256451a586d6f639e7

diff --git a/discover/yaboot-parser.c b/discover/yaboot-parser.c
index 4dd1ea5..b06248f 100644
--- a/discover/yaboot-parser.c
+++ b/discover/yaboot-parser.c
@@ -6,6 +6,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <i18n/i18n.h>
 
 #include "log/log.h"
 #include "talloc/talloc.h"
@@ -114,6 +115,13 @@ static void yaboot_finish(struct conf_context *conf)
 	/* populate the boot option from state data */
 	state->opt->boot_image = create_yaboot_devpath_resource(state,
 				conf, state->boot_image);
+
+	char* args_sigfile_default = talloc_asprintf(opt,
+		"%s.cmdline.sig", state->boot_image);
+	state->opt->args_sig_file = create_yaboot_devpath_resource(state,
+				conf, args_sigfile_default);
+	talloc_free(args_sigfile_default);
+
 	if (state->initrd) {
 		state->opt->initrd = create_yaboot_devpath_resource(state,
 				conf, state->initrd);
@@ -164,6 +172,7 @@ static void yaboot_finish(struct conf_context *conf)
 		state->opt->option->is_default = true;
 
 	discover_context_add_boot_option(conf->dc, state->opt);
+	state->opt = NULL;
 }
 
 static void yaboot_process_pair(struct conf_context *conf, const char *name,
@@ -325,11 +334,15 @@ static struct conf_global_option yaboot_global_options[] = {
 static const char *const yaboot_conf_files[] = {
 	"/yaboot.conf",
 	"/yaboot.cnf",
+	"/etc/lilo.conf",
+	"/etc/silo.conf",
 	"/etc/yaboot.conf",
 	"/etc/yaboot.cnf",
 	"/suseboot/yaboot.cnf",
 	"/YABOOT.CONF",
 	"/YABOOT.CNF",
+	"/ETC/LILO.CONF",
+	"/ETC/SILO.CONF",
 	"/ETC/YABOOT.CONF",
 	"/ETC/YABOOT.CNF",
 	"/SUSEBOOT/YABOOT.CNF",
@@ -369,6 +382,9 @@ static int yaboot_parse(struct discover_context *dc)
 			continue;
 
 		conf_parse_buf(conf, buf, len);
+		device_handler_status_dev_info(dc->handler, dc->device,
+				_("Parsed yaboot configuration from %s"),
+				*filename);
 		talloc_free(buf);
 	}