From nobody Thu Apr 25 22:06:21 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 78.46.105.101 is neither permitted nor denied by domain of seabios.org) client-ip=78.46.105.101; envelope-from=seabios-bounces@seabios.org; helo=coreboot.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 78.46.105.101 is neither permitted nor denied by domain of seabios.org) smtp.mailfrom=seabios-bounces@seabios.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1590360371; cv=none; d=zohomail.com; s=zohoarc; b=T8zFVy/EAr+YTnPZuBs/KJemSBbrig0LcGbGmXFhbgT72XaUvJvdYN/iGP6TXn8VboF85jWPwuCLlltFAEl6Y9YexFFFP0UND0PID0UNVOr3gdyj3020xcMZAi6456P7BsDANEJSf6KeUQImzTFHgIVqqBRTdMJkKjJ8XjwPzrE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590360371; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Subject:To; bh=ePMzEookGSJxHTUdzmnTMPVTm1OK0xw0IvUVA0Cikis=; b=Br5U8ZZz7yBYxBadyoPbz6gYZghU0IuqDjLiym5Hw59R4SStbE0eF0gj3oqmcBCwlaVcYMa2jbvCwiHBfSKwerUkxMDDydKv53VgtPmY8EW1iwb4YFY79NgAiqmGvnF21qy2kDQTV7kwakdkf/fu5LBsyZY/QxZFqPVIFLnWf1w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 78.46.105.101 is neither permitted nor denied by domain of seabios.org) smtp.mailfrom=seabios-bounces@seabios.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from coreboot.org (coreboot.org [78.46.105.101]) by mx.zohomail.com with SMTPS id 159036037109679.73834643130601; Sun, 24 May 2020 15:46:11 -0700 (PDT) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTPA id 4246110C1964; Sun, 24 May 2020 22:46:07 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTP id 32A1B10C1955 for ; Sun, 24 May 2020 22:45:47 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) for ; Sun, 24 May 2020 15:45:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=44j6HkuzSRuwlv4JODVnjcY2N40JYj8leucW2/Rus5E=; b=LRj98WOfkzYYvmhPoU+gSO0wOb8VdFvCIupo2TKmfDzGTP0mM4Ky24z4Pj8MoaFvNd pnUFuWrOwADOgj1pdmY3IAj3C/fFDjmbSE9CuYHrJHAcVsFzqs3P9iJK9BIOuoAlzRWD Nrro9mdTYAxq0kKJUKhtBJ5ImkUYqXE90aX8Pz1qQvkxtj9fMyEE5WL1ipklI9MVNarn PWkmDcxu4Y0TMEmWpQqIYNLMoJjI5fKzMg4Rc/SKJ89SfFU6ZHFUpdth+ZO7I5gpnH2P 1A+JRoP/EvksKoGaNCHcDkFxdLM0dX1usF8K8FyLz41uZ7sFnz1MRObbBx7ziXOcCLT9 8qNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=44j6HkuzSRuwlv4JODVnjcY2N40JYj8leucW2/Rus5E=; b=B5FMPHxjDxVs6Swsf+mYmBOKFEW7/Hhzi+n4Dxia8Y6amgXPRdyfFv+YhgAVi1MVBa V6DAxK23VBi1jqjoGiNSqMzWgLP90Agg03ckYgsj3sLrL1sOFHLIvnR7k9Cf+mMYf37k 40xjCRtOMJ4zDo9oBCYYPn0MIzY6EsLQ4b+1KBD9gCg8UMrBNBQWeO6lxSWGLh87ID2u YyAIYs4tiTkYQcMJ6tCi3JmhN5H3Y2mwVRYrGub7CzgFnZxW5VujuSVTrFE2k8F3346k PIYb2pOzZJi7KrwjaMUsrkDi8elarviYkRPp7+81oTLQ4cK2NHzNKWAcdg3Yz3e35TbX Fxnw== X-Gm-Message-State: AOAM5331Fkv+aIxn498ypyqKvjQZuumXiM/Hp7yBigeX66JUhLH3J/gQ VSMjfWxc7RSasWIOxf3srooUbIIfZ4ibEGC598zgJANE2Tg= X-Google-Smtp-Source: ABdhPJzHu9XjmCBr2OvNQivJ8dCk0mfYeEea5rcj4kv8pFAq/OMdOHSKwOaVmZlEp7ZkgeV/JaRlBOO8H2pXXAXhctw= X-Received: by 2002:a05:6602:2dca:: with SMTP id l10mr11171504iow.163.1590360345640; Sun, 24 May 2020 15:45:45 -0700 (PDT) MIME-Version: 1.0 From: Matt DeVillier Date: Sun, 24 May 2020 17:45:34 -0500 Message-ID: To: seabios Message-ID-Hash: BTOODZXALYTCLILC2OG23CG43FOXPJVE X-Message-ID-Hash: BTOODZXALYTCLILC2OG23CG43FOXPJVE X-MailFrom: matt.devillier@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-seabios.seabios.org-0; header-match-seabios.seabios.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.3.1 Precedence: list Subject: [SeaBIOS] [PATCH] boot: Fix logic for boot menu display List-Id: SeaBIOS mailing list Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: +++ X-Spam-Level: *** Authentication-Results: coreboot.org; auth=pass smtp.auth=mailman@coreboot.org smtp.mailfrom=seabios-bounces@seabios.org X-ZohoMail-DKIM: fail (Computed bodyhash is different from the expected one) Content-Type: text/plain; charset="utf-8" Commit c61193d3 [boot: Extend `etc/show-boot-menu`...] changed the logic surrounding the use of show_boot_menu incorrectly, leading the boot menu to be skipped by default with no way to override. Correct the logic error so that show_boot_menu works as documented. Test: build/boot SeaBIOS, verify boot menu option shown by default. Signed-off-by: Matt DeVillier --- src/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/boot.c b/src/boot.c index 994b592f..58c13add 100644 --- a/src/boot.c +++ b/src/boot.c @@ -697,7 +697,7 @@ interactive_bootmenu(void) // XXX - show available drives? u64 show_boot_menu =3D romfile_loadint("etc/show-boot-menu", 1); - if (! CONFIG_BOOTMENU || show_boot_menu !=3D 0) + if (! CONFIG_BOOTMENU || show_boot_menu =3D=3D 0) return; // skip menu if only one boot device and no TPM --=20 2.25.1 _______________________________________________ SeaBIOS mailing list -- seabios@seabios.org To unsubscribe send an email to seabios-leave@seabios.org