X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fyaboot-parser.c;h=eaefbf0041572cfbcd7dd3fdf3a376d7bd657718;hp=81ab83d548b9e8e93979500a6bbce9bc792954f2;hb=5ee01bf795817cbfa9fb378b11ebd212d66e51c1;hpb=cdaae762f23d137eef7de73f2226f55090ddbec0

diff --git a/discover/yaboot-parser.c b/discover/yaboot-parser.c
index 81ab83d..eaefbf0 100644
--- a/discover/yaboot-parser.c
+++ b/discover/yaboot-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 <ctype.h>
 
 #include "log/log.h"
 #include "talloc/talloc.h"
@@ -53,9 +56,9 @@ static struct resource *create_yaboot_devpath_resource(
 		const char *path)
 {
 	struct discover_boot_option *opt = state->opt;
-	const char *dev, *part;
+	const char *dev, *part, *devpos;
 	struct resource *res;
-	char *devpath;
+	char *devpath, *devstr;
 
 	dev = state->device;
 	part = state->partition;
@@ -69,8 +72,19 @@ static struct resource *create_yaboot_devpath_resource(
 		devpath = talloc_strdup(conf, path);
 
 	} else if (dev && part) {
-		devpath = talloc_asprintf(conf,
-				"%s%s:%s", dev, part, path);
+		devpos = &dev[strlen(dev) - 1];
+		if (isdigit(*devpos)) {
+			while (isdigit(*devpos))
+				devpos--;
+
+			devstr = talloc_strndup(conf, dev, devpos - dev + 1);
+			devpath = talloc_asprintf(conf, "%s%s:%s", devstr,
+					part, path);
+			talloc_free(devstr);
+		} else {
+			devpath = talloc_asprintf(conf,
+					"%s%s:%s", dev, part, path);
+		}
 	} else if (dev) {
 		devpath = talloc_asprintf(conf, "%s:%s", dev, path);
 	} else {
@@ -87,9 +101,11 @@ static struct resource *create_yaboot_devpath_resource(
 static void yaboot_finish(struct conf_context *conf)
 {
 	struct yaboot_state *state = conf->parser_info;
+	const char *default_label;
 	struct boot_option *opt;
 
-	assert(state->opt);
+	if (!state->opt)
+		return;
 
 	opt = state->opt->option;
 	assert(opt);
@@ -143,6 +159,11 @@ static void yaboot_finish(struct conf_context *conf)
 	conf_strip_str(opt->boot_args);
 	conf_strip_str(opt->description);
 
+	default_label = conf_get_global_option(conf, "default");
+	if (default_label &&
+			!strcasecmp(state->opt->option->name, default_label))
+		state->opt->option->is_default = true;
+
 	discover_context_add_boot_option(conf->dc, state->opt);
 }
 
@@ -176,11 +197,10 @@ static void yaboot_process_pair(struct conf_context *conf, const char *name,
 	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)
@@ -302,6 +322,7 @@ static struct conf_global_option yaboot_global_options[] = {
 	{ .name = "video" },
 	{ .name = "literal" },
 	{ .name = "ramdisk" },
+	{ .name = "default" },
 	{ .name = NULL },
 };
 
@@ -337,15 +358,22 @@ static const char *yaboot_known_names[] = {
 	NULL
 };
 
-static int yaboot_parse(struct discover_context *dc, char *buf, int len)
+static int yaboot_parse(struct discover_context *dc)
 {
-	struct conf_context *conf;
+	const char * const *filename;
 	struct yaboot_state *state;
+	struct conf_context *conf;
+	int len, rc;
+	char *buf;
+
+	/* 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 = yaboot_global_options,
@@ -359,17 +387,22 @@ static int yaboot_parse(struct discover_context *dc, char *buf, int len)
 
 	state->opt = NULL;
 
-	conf_parse_buf(conf, buf, len);
+	for (filename = yaboot_conf_files; *filename; filename++) {
+		rc = parser_request_file(dc, dc->device, *filename, &buf, &len);
+		if (rc)
+			continue;
+
+		conf_parse_buf(conf, buf, len);
+		talloc_free(buf);
+	}
 
 	talloc_free(conf);
-	return 1;
+	return 0;
 }
 
 static struct parser yaboot_parser = {
 	.name			= "yaboot",
-	.method			= CONF_METHOD_LOCAL_FILE,
 	.parse			= yaboot_parse,
-	.filenames		= yaboot_conf_files,
 	.resolve_resource	= resolve_devpath_resource,
 };