X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fyaboot-parser.c;h=aa993928f86c5b6121f6bce95c094f2b8f746501;hp=41f43eb614186926ad38dd8bebe1f3b2f6f958d8;hb=8fa3f3bd22e66329ac0dd65a82bf8eb554e2364d;hpb=66bf929fa97fabb70198455f9eec2e9ccf0661fa

diff --git a/discover/yaboot-parser.c b/discover/yaboot-parser.c
index 41f43eb..aa99392 100644
--- a/discover/yaboot-parser.c
+++ b/discover/yaboot-parser.c
@@ -16,7 +16,6 @@
 
 struct yaboot_state {
 	int globals_done;
-	const char *const *known_names;
 
 	/* current option data */
 	struct discover_boot_option *opt;
@@ -194,14 +193,10 @@ static void yaboot_process_pair(struct conf_context *conf, const char *name,
 	if (!state->globals_done && conf_set_global_option(conf, name, value))
 		return;
 
-	if (!conf_param_in_list(state->known_names, name))
-		return;
-
-	state->globals_done = 1;
-
 	/* image */
-
 	if (streq(name, "image")) {
+		/* an image section finishes our global defintions */
+		state->globals_done = 1;
 
 		/* First finish any previous image. */
 		if (opt)
@@ -245,7 +240,7 @@ static void yaboot_process_pair(struct conf_context *conf, const char *name,
 
 	/* all other processing requires an image */
 	if (!opt) {
-		pb_log("%s: unknown name: %s\n", __func__, name);
+		pb_debug("%s: unknown name: %s\n", __func__, name);
 		return;
 	}
 
@@ -311,7 +306,7 @@ static void yaboot_process_pair(struct conf_context *conf, const char *name,
 		return;
 	}
 
-	pb_log("%s: unknown name: %s\n", __func__, name);
+	pb_debug("%s: unknown name: %s\n", __func__, name);
 }
 
 static struct conf_global_option yaboot_global_options[] = {
@@ -330,35 +325,21 @@ 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",
 	NULL
 };
 
-static const char *yaboot_known_names[] = {
-	"append",
-	"image",
-	"image[64bit]", /* SUSE extension */
-	"image[32bit]", /* SUSE extension */
-	"initrd",
-	"initrd-size",
-	"label",
-	"literal",
-	"ramdisk",
-	"read-only",
-	"read-write",
-	"root",
-	"device",
-	"partition",
-	NULL
-};
-
 static int yaboot_parse(struct discover_context *dc)
 {
 	const char * const *filename;
@@ -384,8 +365,6 @@ static int yaboot_parse(struct discover_context *dc)
 	conf->finish = yaboot_finish;
 	conf->parser_info = state = talloc_zero(conf, struct yaboot_state);
 
-	state->known_names = yaboot_known_names;
-
 	state->opt = NULL;
 
 	for (filename = yaboot_conf_files; *filename; filename++) {