From patchwork Tue Apr 17 17:08:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 899467 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40QWzd39nBz9s19 for ; Wed, 18 Apr 2018 03:13:17 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 40QWzd1xYjzF216 for ; Wed, 18 Apr 2018 03:13:17 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=redhat.com (client-ip=209.85.128.195; helo=mail-wr0-f195.google.com; envelope-from=javierm@redhat.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40QWvB1q9NzF20w for ; Wed, 18 Apr 2018 03:09:25 +1000 (AEST) Received: by mail-wr0-f195.google.com with SMTP id d1so37542879wrj.13 for ; Tue, 17 Apr 2018 10:09:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qvdMFbK/Su4D5XyMu0egLKcux+lYINB+7iIJvuVCvN8=; b=dYKkpFDfOD1k3akaSzRnfwUj7dfafFLP7w96MKDCsF1u0HYpsMrA71KlgWH2vyxUa0 OVfYfV/H4G5TwHdywBfUxFhm7JTNLOXZWz4HTWxZNWE7ZA5VCeHwIgxcu1zXVFgGH0t9 71guNf9tYP0yB098WnpL7pK1qkgJ31Mb/Lb0mcyWCh+yp+w0cBTJpK4M/0wiKtO20HKk CMBytqtlTMuzSfyjO2rnLgCn8zNqy34mzF/4+CRlqArwur7lAuJ+nYrkAOue/5RSnB/8 Dl6emFFwfq7auaDzVGeQYeJwqA7d+HCPaE4V6v0Rfd23eAnll8a+MyI0Hab2R7ds00dW DMzw== X-Gm-Message-State: ALQs6tCFBdnKSDHEGSKzcs6pk1s2JOP/rlPN1eXQxp8Oqqs1un8WR1mb 7xqsJUI0n2As1fWBniys4muSWxA08po= X-Google-Smtp-Source: AIpwx4+vOIgt69WpHS3OnKfmQB3Xj66yIxQdQ+Mye0vkArL7PEruzuvKCau5yCt6+aiS7Lkwkc8EqQ== X-Received: by 10.223.189.5 with SMTP id j5mr1243648wrh.138.1523984962107; Tue, 17 Apr 2018 10:09:22 -0700 (PDT) Received: from minerva.redhat.com ([90.77.100.34]) by smtp.gmail.com with ESMTPSA id b5sm14861993wrf.40.2018.04.17.10.09.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Apr 2018 10:09:21 -0700 (PDT) From: Javier Martinez Canillas To: petitboot@lists.ozlabs.org Subject: [PATCH v2 2/3] discover/grub: Don't add discover context boot options in blscfg handler Date: Tue, 17 Apr 2018 19:08:59 +0200 Message-Id: <20180417170900.31045-2-javierm@redhat.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180417170900.31045-1-javierm@redhat.com> References: <20180417170900.31045-1-javierm@redhat.com> X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Javier Martinez Canillas , Peter Jones , Jan Hlavac , Samuel Mendoza-Jonas MIME-Version: 1.0 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" 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 --- Changes in v2: None discover/grub2/blscfg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/discover/grub2/blscfg.c b/discover/grub2/blscfg.c index d20dde20bb9c..5dadd2c6e8ef 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"),