summaryrefslogtreecommitdiffstats
path: root/discover/grub2
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2014-01-24 13:45:24 +0800
committerJeremy Kerr <jk@ozlabs.org>2014-01-30 21:59:10 +0800
commiteea9a9fa697654ef26d7e2c1cee3b4ac610db643 (patch)
tree3bb86dbcab1a1908926f4231dd3f0b81dceafacd /discover/grub2
parent2e167ae3eca9b79cf67e04c02b8dbb7b105055a9 (diff)
downloadtalos-petitboot-eea9a9fa697654ef26d7e2c1cee3b4ac610db643.tar.gz
talos-petitboot-eea9a9fa697654ef26d7e2c1cee3b4ac610db643.zip
discover/grub2: skip menuentries that don't define a boot option
menuentries may perform arbitrary commands; we only want ones that define a boot option. This change doesn't add a boot option if we haven't seen at least a boot image defined in the menuentry. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/grub2')
-rw-r--r--discover/grub2/script.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/discover/grub2/script.c b/discover/grub2/script.c
index 642ed2a..3e2ee05 100644
--- 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);
OpenPOWER on IntegriCloud