X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fgrub2%2Fblscfg.c;h=78086ee9fb0fa8d286afe160f132d0883edefdeb;hb=b1234ac9dd09c9ceaf929c9d4d738fd556525291;hp=d20dde20bb9c3a51d6152dc89d21a34117470021;hpb=73bcd24e9a96468b81395e7f57d3568e5d1f7dd3;p=petitboot

diff --git a/discover/grub2/blscfg.c b/discover/grub2/blscfg.c
index d20dde2..78086ee 100644
--- a/discover/grub2/blscfg.c
+++ b/discover/grub2/blscfg.c
@@ -20,6 +20,7 @@
 struct bls_state {
 	struct discover_boot_option *opt;
 	struct grub2_script *script;
+	unsigned int idx;
 	const char *filename;
 	const char *title;
 	const char *version;
@@ -81,19 +82,25 @@ static void bls_process_pair(struct conf_context *conf, const char *name,
 	}
 }
 
-static bool option_is_default(struct grub2_script *script,
+static bool option_is_default(struct bls_state *state,
 			      struct boot_option *option)
 {
+	unsigned int idx;
 	const char *var;
+	char *end;
 
-	var = script_env_get(script, "default");
+	var = script_env_get(state->script, "default");
 	if (!var)
 		return false;
 
 	if (!strcmp(var, option->id))
 		return true;
 
-	return !strcmp(var, option->name);
+	if (!strcmp(var, option->name))
+		return true;
+
+	idx = strtoul(var, &end, 10);
+	return end != var && *end == '\0' && idx == state->idx;
 }
 
 static void bls_finish(struct conf_context *conf)
@@ -141,9 +148,16 @@ static void bls_finish(struct conf_context *conf)
 		opt->dtb = create_grub2_resource(opt, conf->dc->device,
 						 root, state->dtb);
 
-	option->is_default = option_is_default(state->script, option);
+	char* args_sigfile_default = talloc_asprintf(opt,
+		"%s.cmdline.sig", state->image);
+	opt->args_sig_file = create_grub2_resource(opt, conf->dc->device,
+						root, args_sigfile_default);
+	talloc_free(args_sigfile_default);
+
+	option->is_default = option_is_default(state, option);
 
-	discover_context_add_boot_option(dc, opt);
+	list_add_tail(&state->script->options, &opt->list);
+	state->script->n_options++;
 
 	device_handler_status_dev_info(dc->handler, dc->device,
 				       _("Created menu entry from BLS file %s"),
@@ -175,6 +189,7 @@ int builtin_blscfg(struct grub2_script *script,
 		int argc __attribute__((unused)),
 		char *argv[] __attribute__((unused)))
 {
+	unsigned int current_idx = script->n_options;
 	struct discover_context *dc = script->ctx;
 	struct dirent **bls_entries;
 	struct conf_context *conf;
@@ -216,6 +231,7 @@ int builtin_blscfg(struct grub2_script *script,
 
 		state->script = script;
 		state->filename = filename;
+		state->idx = current_idx++;
 		conf->parser_info = state;
 
 		rc = parser_request_file(dc, dc->device, filename, &buf, &len);