X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2-parser.c;h=bd08ec0a70c750f90d91f4c609bd427125ceb594;hp=689c200d0f3f7ffc76ed113c0f996879ab9894d9;hb=c019c1cea9c12aff4aa945414bb2841d085d5b10;hpb=b49b9c92416ce4b65642dd3395becb4ea083dc2b

diff --git a/discover/grub2-parser.c b/discover/grub2-parser.c
index 689c200..bd08ec0 100644
--- a/discover/grub2-parser.c
+++ b/discover/grub2-parser.c
@@ -27,76 +27,136 @@
 
 #include "log/log.h"
 #include "talloc/talloc.h"
-#include "pb-protocol/pb-protocol.h"
+#include "types/types.h"
 #include "parser-conf.h"
 #include "parser-utils.h"
 #include "paths.h"
+#include "resource.h"
+
+struct grub2_root {
+	char *uuid;
+};
 
 struct grub2_state {
-	struct boot_option *opt;
+	struct discover_boot_option *opt;
 	char *desc_image;
 	char *desc_initrd;
 	const char *const *known_names;
+	struct grub2_root *root;
+};
+
+struct grub2_resource_info {
+	struct grub2_root *root;
+	char *path;
 };
 
+/* we use slightly different resources for grub2 */
+static struct resource *create_grub2_resource(void *ctx,
+		struct discover_device *orig_device,
+		struct grub2_root *root, const char *path)
+{
+	struct grub2_resource_info *info;
+	struct resource *res;
+
+	res = talloc(ctx, struct resource);
+
+	if (root) {
+		info = talloc(res, struct grub2_resource_info);
+		info->root = root;
+		talloc_reference(info, root);
+		info->path = talloc_strdup(info, path);
+
+		res->resolved = false;
+		res->info = info;
+
+	} else
+		resolve_resource_against_device(res, orig_device, path);
+
+	return res;
+}
+
+static bool resolve_grub2_resource(struct device_handler *handler,
+		struct resource *res)
+{
+	struct grub2_resource_info *info = res->info;
+	struct discover_device *dev;
+
+	assert(!res->resolved);
+
+	dev = device_lookup_by_uuid(handler, info->root->uuid);
+
+	if (!dev)
+		return false;
+
+	resolve_resource_against_device(res, dev, info->path);
+	talloc_free(info);
+
+	return true;
+}
+
 static void grub2_finish(struct conf_context *conf)
 {
+	struct device *dev = conf->dc->device->device;
 	struct grub2_state *state = conf->parser_info;
+	struct boot_option *opt;
 
 	if (!state->desc_image) {
-		pb_log("%s: %s: no image found\n", __func__,
-			conf->dc->device->id);
+		pb_log("%s: %s: no image found\n", __func__, dev->id);
 		return;
 	}
 
 	assert(state->opt);
-	assert(state->opt->name);
-	assert(state->opt->boot_args);
+	opt = state->opt->option;
+
+	assert(opt);
+	assert(opt->name);
+	assert(opt->boot_args);
 
-	state->opt->description = talloc_asprintf(state->opt, "%s %s %s",
+	opt->description = talloc_asprintf(opt, "%s %s %s",
 		state->desc_image,
 		(state->desc_initrd ? state->desc_initrd : ""),
-		state->opt->boot_args);
+		opt->boot_args);
 
 	talloc_free(state->desc_initrd);
 	state->desc_initrd = NULL;
 
-	conf_strip_str(state->opt->boot_args);
-	conf_strip_str(state->opt->description);
+	conf_strip_str(opt->boot_args);
+	conf_strip_str(opt->description);
 
 	/* opt is persistent, so must be associated with device */
 
-	device_add_boot_option(conf->dc->device, state->opt);
-	state->opt = talloc_zero(conf->dc->device, struct boot_option);
-	state->opt->boot_args = talloc_strdup(state->opt, "");
+	discover_context_add_boot_option(conf->dc, state->opt);
 
-	talloc_free(state->desc_image);
-	state->desc_image = NULL;
+	state->opt = NULL;
 }
 
 static void grub2_process_pair(struct conf_context *conf, const char *name,
 		char *value)
 {
+	struct device *dev = conf->dc->device->device;
 	struct grub2_state *state = conf->parser_info;
+	struct discover_boot_option *opt = state->opt;
 
 	if (!name || !conf_param_in_list(state->known_names, name))
 		return;
 
 	if (streq(name, "menuentry")) {
-		char *sep;
-
-		grub2_finish(conf);
+		/* complete any existing option... */
+		if (state->opt)
+			grub2_finish(conf);
 
-		/* Then start the new image. */
+		/* ... then start the new one */
+		opt = discover_boot_option_create(conf->dc, conf->dc->device);
+		opt->option->boot_args = talloc_strdup(opt->option, "");
 
-		sep = strchr(value, '\'');
+		value = strtok(value, "\'{\"");
 
-		if (sep)
-			*sep = 0;
+		opt->option->id = talloc_asprintf(opt->option,
+					"%s#%s", dev->id, value);
+		opt->option->name = talloc_strdup(opt->option, value);
+		opt->option->boot_args = talloc_strdup(opt, "");
 
-		state->opt->id = talloc_asprintf(state->opt, "%s#%s",
-			conf->dc->device->id, value);
-		state->opt->name = talloc_strdup(state->opt, value);
+		state->opt = opt;
 
 		return;
 	}
@@ -109,35 +169,69 @@ static void grub2_process_pair(struct conf_context *conf, const char *name,
 		if (sep)
 			*sep = 0;
 
-		state->opt->boot_image_file = resolve_path(state->opt,
-			value, conf->dc->device_path);
-		state->desc_image = talloc_strdup(state->opt, value);
+		opt->boot_image = create_grub2_resource(opt, conf->dc->device,
+					state->root, value);
+		state->desc_image = talloc_strdup(opt, value);
 
 		if (sep)
-			state->opt->boot_args = talloc_strdup(state->opt,
-				sep + 1);
+			opt->option->boot_args = talloc_strdup(opt, sep + 1);
 
 		return;
 	}
 
 	if (streq(name, "initrd")) {
-		state->opt->initrd_file = resolve_path(state->opt,
-			value, conf->dc->device_path);
+		opt->initrd = create_grub2_resource(opt, conf->dc->device,
+					state->root, value);
 		state->desc_initrd = talloc_asprintf(state, "initrd=%s",
 			value);
 		return;
 	}
 
+	if (streq(name, "search")) {
+		struct grub2_root *root;
+		char *uuid;
+
+		if (!strstr(value, "--set=root")) {
+			pb_log("%s: no root\n", __func__);
+			return;
+		}
+
+		/* The UUID should be the last argument to the search command.
+		 * FIXME: this is a little fragile; would be nice to have some
+		 * parser helpers to deal with "command args" parsing
+		 */
+		uuid = strrchr(value, ' ');
+		if (!uuid)
+			return;
+
+		uuid++;
+		pb_log("%s: uuid %s\n", __func__, uuid);
+
+		if (state->root)
+			talloc_unlink(state, state->root);
+
+		root = talloc(state, struct grub2_root);
+		root->uuid = talloc_strdup(root, uuid);
+		state->root = root;
+		return;
+	}
+
 	pb_log("%s: unknown name: %s\n", __func__, name);
 }
 
 static const char *const grub2_conf_files[] = {
 	"/grub.cfg",
 	"/menu.lst",
+	"/grub/grub.cfg",
+	"/grub2/grub.cfg",
+	"/grub/menu.lst",
 	"/boot/grub/grub.cfg",
 	"/boot/grub/menu.lst",
 	"/GRUB.CFG",
 	"/MENU.LST",
+	"/GRUB/GRUB.CFG",
+	"/GRUB2/GRUB.CFG",
+	"/GRUB/MENU.LST",
 	"/BOOT/GRUB/GRUB.CFG",
 	"/BOOT/GRUB/MENU.LST",
 	NULL
@@ -147,14 +241,14 @@ static const char *grub2_known_names[] = {
 	"menuentry",
 	"linux",
 	"initrd",
+	"search",
 	NULL
 };
 
-static int grub2_parse(struct discover_context *dc)
+static int grub2_parse(struct discover_context *dc, char *buf, int len)
 {
 	struct conf_context *conf;
 	struct grub2_state *state;
-	int rc;
 
 	conf = talloc_zero(dc, struct conf_context);
 
@@ -163,7 +257,6 @@ static int grub2_parse(struct discover_context *dc)
 
 	conf->dc = dc;
 	conf_init_global_options(conf);
-	conf->conf_files = grub2_conf_files,
 	conf->get_pair = conf_get_pair_space;
 	conf->process_pair = grub2_process_pair;
 	conf->finish = grub2_finish;
@@ -171,15 +264,18 @@ static int grub2_parse(struct discover_context *dc)
 
 	state->known_names = grub2_known_names;
 
-	/* opt is persistent, so must be associated with device */
-
-	state->opt = talloc_zero(conf->dc->device, struct boot_option);
-	state->opt->boot_args = talloc_strdup(state->opt, "");
-
-	rc = conf_parse(conf);
+	conf_parse_buf(conf, buf, len);
 
 	talloc_free(conf);
-	return rc;
+	return 1;
 }
 
-define_parser(grub2, grub2_parse);
+static struct parser grub2_parser = {
+	.name			= "grub2",
+	.method			= CONF_METHOD_LOCAL_FILE,
+	.parse			= grub2_parse,
+	.filenames		= grub2_conf_files,
+	.resolve_resource	= resolve_grub2_resource,
+};
+
+register_parser(grub2_parser);