From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1oQDlp-0001h2-2Y for mharc-grub-devel@gnu.org; Mon, 22 Aug 2022 16:11:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQDln-0001gr-Ek for grub-devel@gnu.org; Mon, 22 Aug 2022 16:11:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:46691) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQDll-0001vP-3L for grub-devel@gnu.org; Mon, 22 Aug 2022 16:11:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661199090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3BOfUSZDFPcwA+wt+ix3UKsqUPvrQkc3ZFRatSDgwbk=; b=iNW62AW63iUc4RT2jIWO/7FDz5FDABzLrtULXMItX6dW7UY8/tS5czSGVRg9k03UA2WKbJ YKX3arQeWIzQ71jqxTN921joi0xe4hSvd9e+dIr8cTPGBI+RiwNFAWSKlVDaR5NwqCUDrQ XqwCK78t6CAXpzkE+7UsCjZjyksIjqs= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-131-DHmJcSF8OVaneixYGLab4Q-1; Mon, 22 Aug 2022 16:11:26 -0400 X-MC-Unique: DHmJcSF8OVaneixYGLab4Q-1 Received: by mail-qt1-f199.google.com with SMTP id y12-20020ac8708c000000b00342f1bb8428so9037249qto.5 for ; Mon, 22 Aug 2022 13:11:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc; bh=3BOfUSZDFPcwA+wt+ix3UKsqUPvrQkc3ZFRatSDgwbk=; b=gwxJ5cpoIXCWJOCTLJ1YrS6f3WDupR5aZpJe0Dayk43LZ/MZuP4DBqfBjV9+YRDnlf DvztrI7l+R97LSbZbqsVwiUj32eMN34zfvGZ26zDK7LUp1M5WYGGGuHYsxFVmVhPKcp8 di/Gcx97c73apN27CvD50RQ9OeFjxTnFjNwQvjybZ1ucIY/ATVT4kftEa26tvrCG93Ye LWwkU3YceIaHByYIIk6Ao4aFStZOc7hQAOzKO2vFCRPnGGu4Kkn1U4Ol+iWRrkTOt9t/ 7az9RDa54VATBPNjc/GhT9LIkT9v0p8bNMaCDTOB2r7GnJJuZRuzGzgzLxzUQFibXZsu LdIQ== X-Gm-Message-State: ACgBeo0NM0qWFkGX6O4AwboZHmnkDOe0wCs5Cr6PPa5ISo2KUaQVlpjx pMqTgHVwj730uEuHOI4VS7I3YHR9Ekzt9lcMGWC2R2zMUXDSpzon6ZJ7dUjVj4qEPmsRrLEfF7m aYdJgqQ1UNTY= X-Received: by 2002:a05:6214:1c8c:b0:46e:15b2:3f35 with SMTP id ib12-20020a0562141c8c00b0046e15b23f35mr17501071qvb.76.1661199086244; Mon, 22 Aug 2022 13:11:26 -0700 (PDT) X-Google-Smtp-Source: AA6agR6+QcC62/pdC2HracKtBUj6vkXazug/FgjpXhqTYEMC1CpMRhjPovZOIzsM2ryw/DOwSWGRTg== X-Received: by 2002:a05:6214:1c8c:b0:46e:15b2:3f35 with SMTP id ib12-20020a0562141c8c00b0046e15b23f35mr17501044qvb.76.1661199085941; Mon, 22 Aug 2022 13:11:25 -0700 (PDT) Received: from localhost ([2601:184:4181:74c0:862e:5809:ed9e:e10e]) by smtp.gmail.com with ESMTPSA id f22-20020a05620a409600b006bad20a6cfesm12894463qko.102.2022.08.22.13.11.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Aug 2022 13:11:25 -0700 (PDT) From: Robbie Harwood To: development@efficientek.com Cc: grub-devel@gnu.org, dkiper@net-space.pl, pmenzel@molgen.mpg.de, javierm@redhat.com Subject: Re: [PATCH v4 5/5] Don't display a uefi-firmware entry if it's not supported In-Reply-To: <20220819172619.777e928e@crass-HP-ZBook-15-G2> References: <20220818175013.82579-1-rharwood@redhat.com> <20220818175013.82579-6-rharwood@redhat.com> <20220819172619.777e928e@crass-HP-ZBook-15-G2> Date: Mon, 22 Aug 2022 16:11:22 -0400 Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=170.10.129.124; envelope-from=rharwood@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Aug 2022 20:11:35 -0000 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Glenn Washburn writes: > On Thu, 18 Aug 2022 13:50:13 -0400 > Robbie Harwood wrote: > >> Add a new --is-supported option to commands/efi/efifwsetup and >> conditionalize display on it. >>=20 >> Signed-off-by: Robbie Harwood >> --- >> grub-core/commands/efi/efifwsetup.c | 3 +++ >> util/grub.d/30_uefi-firmware.in | 2 +- >> 2 files changed, 4 insertions(+), 1 deletion(-) >>=20 >> diff --git a/grub-core/commands/efi/efifwsetup.c b/grub-core/commands/ef= i/efifwsetup.c >> index cb4b6ff18c..53d23deea7 100644 >> --- a/grub-core/commands/efi/efifwsetup.c >> +++ b/grub-core/commands/efi/efifwsetup.c >> @@ -40,6 +40,9 @@ grub_cmd_fwsetup (grub_command_t cmd __attribute__ ((u= nused)), >> grub_size_t oi_size; >> static grub_efi_guid_t global =3D GRUB_EFI_GLOBAL_VARIABLE_GUID; >>=20=20 >> + if (argc >=3D 1 && grub_strcmp(args[0], "--is-supported") =3D=3D 0) >> + return !efifwsetup_is_supported (); >> + >> if (!efifwsetup_is_supported ()) >> return grub_error (GRUB_ERR_INVALID_COMMAND, >> N_("reboot to firmware setup is not supported by the current fi= rmware")); >> diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmw= are.in >> index b6041b55e2..78aef67d78 100644 >> --- a/util/grub.d/30_uefi-firmware.in >> +++ b/util/grub.d/30_uefi-firmware.in >> @@ -31,7 +31,7 @@ LABEL=3D"UEFI Firmware Settings" >> gettext_printf "Adding boot menu entry for UEFI Firmware Settings ...\n= " >&2 >>=20=20 >> cat << EOF >> -if [ "\$grub_platform" =3D "efi" ]; then >> +if [ "\$grub_platform" =3D "efi" ] && fwsetup --is-supported; then > > I don't believe that grub currently supported the && syntax. I just > tested and I'm getting syntax errors. > > Untested, but I believe the following should work: > > fwsetup --is-supported > if [ "\$grub_platform" =3D "efi" -a "\$?" =3D "0" ]; then Good catch, thanks. Be well, =2D-Robbie --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJIBAEBCgAyFiEEA5qc6hnelQjDaHWqJTL5F2qVpEIFAmMD4usUHHJoYXJ3b29k QHJlZGhhdC5jb20ACgkQJTL5F2qVpEJQexAAo7kXV9yRXUfVqXEvkQe4MVb2Lo4j 97D18Fmjo1+QzE2Ots0uuCciZTjjup60T4VBggdGBLPDKG0OksXdvZoqPC26Qy39 qnSL23r8Lg/0uLv+HNF779GV1AADIr4FB1IzXQlJzdtKhUbJ7bubbyWD2TG8Cchd kinMqxWltBL3aK2M8bxEnBerrYnkoMTvrw9zGihIvSvWSNkX7E/XKj4obG7ZH20q M3UAyOw9EyZJScRNb3RdBP7Xt9vQA8SDFU40sUEJsVaXkWmtUECyFlsBP2979AZr NLKbGHEj1Ahq3JqnVaWK7Molnkw0Nkxmx5fha0HIaZb5Wtd2QHKTpvPi9Zz3MHKe ns2Q0xFtWMCmvmw8SChmfn3GpnwhDj/NrtVZvfxK6T8/mT0FMjiAC/WemqqM7zpR Tj+IPsEK/5JAkXs7/9FPBCvvxL/dTGSVGb2PSx1ln1x0fWwGLw1UPo6JOEcTNMOO 50XWhmJfinQNSI7Y27n+3AAV96HimWaNuqp/UH0A7AdZQh5O6iQhp2pznX8BR+dQ YuFazL61TiEokTL4HrUtjJKWPP0yCAuXaCfUlUr/RWljkwYE9c22/YMLDEEfuYsE ggU78mAiDQTVEb1deNeFnuSp0etdoEQqe9yV8YbXXQ3qO+0gF8GI+qHNLySRMNqX jz6obWPOYU4nwco= =hM9W -----END PGP SIGNATURE----- --=-=-=--