From: Javier Martinez Canillas Date: Tue, 17 Apr 2018 17:08:59 +0000 (+0200) Subject: discover/grub: Don't add discover context boot options in blscfg handler X-Git-Tag: v1.8.0~13 X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=f78714f16515783d79e636040cedccb3eb6611a3;hp=73bcd24e9a96468b81395e7f57d3568e5d1f7dd3 discover/grub: Don't add discover context boot options in blscfg handler Instead of adding a boot option explicitly, just add it to the grub script boot option list and increment the number of options. That way BLS entries will be known by the grub script handler and can check if is a valid index. Signed-off-by: Javier Martinez Canillas Signed-off-by: Samuel Mendoza-Jonas --- diff --git a/discover/grub2/blscfg.c b/discover/grub2/blscfg.c index d20dde2..5dadd2c 100644 --- a/discover/grub2/blscfg.c +++ b/discover/grub2/blscfg.c @@ -143,7 +143,8 @@ static void bls_finish(struct conf_context *conf) option->is_default = option_is_default(state->script, 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"),