discover/grub2: Add option state in menuentry processing

This will allow menuentry-specific commands to populate boot option
data.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

2 files changed, 17 insertions, 0 deletions

diff --git a/discover/grub2/grub2.h b/discover/grub2/grub2.h
index fca0fa2..1ac9f88 100644
--- a/discover/grub2/grub2.h
+++ b/discover/grub2/grub2.h
@@ -84,6 +84,7 @@ struct grub2_script {
 	struct list			commands;
 	struct list			symtab;
 	struct discover_context		*ctx;
+	struct discover_boot_option	*opt;
 };
 
 struct grub2_parser {
diff --git a/discover/grub2/script.c b/discover/grub2/script.c
index 5b38156..8b008c4 100644
--- a/discover/grub2/script.c
+++ b/discover/grub2/script.c
@@ -2,6 +2,7 @@
 #include <sys/types.h>
 #include <string.h>
 
+#include <types/types.h>
 #include <talloc/talloc.h>
 
 #include "grub2.h"
@@ -255,10 +256,24 @@ int statement_menuentry_execute(struct grub2_script *script,
 		struct grub2_statement *statement)
 {
 	struct grub2_statement_menuentry *st = to_stmt_menuentry(statement);
+	struct discover_boot_option *opt;
 
 	process_expansions(script, st->argv);
+
+	opt = discover_boot_option_create(script->ctx, script->ctx->device);
+	if (st->argv->argc > 0) {
+		opt->option->name = talloc_strdup(opt, st->argv->argv[0]);
+	} else {
+		opt->option->name = talloc_strdup(opt, "(unknown)");
+	}
+
+	script->opt = opt;
+
 	statements_execute(script, st->statements);
 
+	discover_context_add_boot_option(script->ctx, opt);
+	script->opt = NULL;
+
 	return 0;
 }
 
@@ -309,6 +324,7 @@ struct grub2_script *create_script(struct grub2_parser *parser,
 
 	init_env(script);
 	script->ctx = ctx;
+	script->opt = NULL;
 
 	list_init(&script->commands);
 	register_builtins(script);