discover/grub2: skip menuentries that don't define a boot option

[petitboot] / discover / grub2 / script.c

diff --git a/discover/grub2/script.c b/discover/grub2/script.c
index c4f58d92bacb27395647a23d9c4f9feb5d8d6016..3e2ee055134aad3482a50e80d94f1e5e654e83ae 100644 (file)
--- a/discover/grub2/script.c
+++ b/discover/grub2/script.c
@@ -374,6 +374,9 @@ int statement_menuentry_execute(struct grub2_script *script,
 
        statements_execute(script, st->statements);
 
+       if (!opt->boot_image)
+               return -1;
+
        opt->option->is_default = option_is_default(script, opt, id);
 
        discover_context_add_boot_option(script->ctx, opt);
@@ -435,6 +438,9 @@ static void init_env(struct grub2_script *script)
        script_env_set(script, "prefix", prefix ? : default_prefix);
        if (prefix)
                talloc_free(prefix);
+
+       /* establish feature settings */
+       script_env_set(script, "feature_menuentry_id", "y");
 }
 
 void script_register_function(struct grub2_script *script,