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

diff --git a/discover/grub2-parser.c b/discover/grub2-parser.c
index bb47d6c..bd08ec0 100644
--- a/discover/grub2-parser.c
+++ b/discover/grub2-parser.c
@@ -30,15 +30,70 @@
 #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 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;
@@ -86,8 +141,6 @@ static void grub2_process_pair(struct conf_context *conf, const char *name,
 		return;
 
 	if (streq(name, "menuentry")) {
-		char *sep;
-
 		/* complete any existing option... */
 		if (state->opt)
 			grub2_finish(conf);
@@ -96,10 +149,7 @@ static void grub2_process_pair(struct conf_context *conf, const char *name,
 		opt = discover_boot_option_create(conf->dc, conf->dc->device);
 		opt->option->boot_args = talloc_strdup(opt->option, "");
 
-		sep = strchr(value, '\'');
-
-		if (sep)
-			*sep = 0;
+		value = strtok(value, "\'{\"");
 
 		opt->option->id = talloc_asprintf(opt->option,
 					"%s#%s", dev->id, value);
@@ -119,8 +169,8 @@ static void grub2_process_pair(struct conf_context *conf, const char *name,
 		if (sep)
 			*sep = 0;
 
-		opt->boot_image = create_devpath_resource(opt,
-					conf->dc->device, value);
+		opt->boot_image = create_grub2_resource(opt, conf->dc->device,
+					state->root, value);
 		state->desc_image = talloc_strdup(opt, value);
 
 		if (sep)
@@ -130,13 +180,42 @@ static void grub2_process_pair(struct conf_context *conf, const char *name,
 	}
 
 	if (streq(name, "initrd")) {
-		opt->initrd = create_devpath_resource(opt,
-					conf->dc->device, value);
+		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);
 }
 
@@ -144,12 +223,14 @@ 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",
@@ -160,6 +241,7 @@ static const char *grub2_known_names[] = {
 	"menuentry",
 	"linux",
 	"initrd",
+	"search",
 	NULL
 };
 
@@ -193,7 +275,7 @@ static struct parser grub2_parser = {
 	.method			= CONF_METHOD_LOCAL_FILE,
 	.parse			= grub2_parse,
 	.filenames		= grub2_conf_files,
-	.resolve_resource	= resolve_devpath_resource,
+	.resolve_resource	= resolve_grub2_resource,
 };
 
 register_parser(grub2_parser);