From nobody Tue Apr 16 02:34:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VJSmS751sz5Hb13; Tue, 16 Apr 2024 02:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VJSmS4lVzz4HQt; Tue, 16 Apr 2024 02:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713234872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ZV3m5v5a1OlUe89elZ/nwNM+OQjyMkSpuHY28aVZbc=; b=MR0aUgedHDWQ9X7kP2ASGoJbAwBeLn54vStHcF9+rtnvxjmo3yixt7ZXp1o+wCU8QFi+Ac hW9oPEGK3EExShk4vtgTwMAPVimEq2pP6k8OooAkZySS8z2Dxu7Q9bRM1Qvvxzt9UniPs6 oosEeEJ7um9dm62uAMJEmQxUX7x0EU6g/qbF9TYyNMOZ5I7OBOtBQd5SVAPpn47PEKTNi3 q1AUJDxUwREGIhMJ6uoLj/gUOnhdcbTNJy3tobHxU587xEj+VanIJT94G49K0qUalDGLej T/hRyGJjV/3e2UK0jYsfYcKiVdRiwQeEq7Qn1H9W+tdSRCN29A+hVOW854XB5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713234872; a=rsa-sha256; cv=none; b=LYrQmLVNt5eSta/phVlDyRfre+EcPtwAefb63wAoMi/WFgUuTSs0jdzXAo0/olM2rn9Pm6 n/a20mlSaF1p4MvmT7lot1hRHRI6cAYj0NavlubCpHjWDBrGkpacVhyMq9aPXptggl4iWI hcVMJCN1o9bKfmMxxkkpy2dCcBm3Vus/uL4/LzYb6Hj4pbM3hs+vSv0BpjAOqisj99DIJi Iiyquxd1oqR5M9FKWxIHrGeySHuxaOUMWRYg7gNguL+dqM9tko2OcxfpkKC59mlpaFBGZQ 7fKzV8e9lk8JhmHwDN1Vmcz3Zx3mBPOTjtLqRQO4tSwvKOjQLovR3Tc0nepYaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713234872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ZV3m5v5a1OlUe89elZ/nwNM+OQjyMkSpuHY28aVZbc=; b=kFzQrziSIxS6BvzTj4D4mn9vZ+lu8LvDdgdRPHjeiZEceQsh6fhTNqFAmCEK95PK3mCwKF cDQOCUSV6LyRE1Yk4sznC77hda9Pqioj6x84ZOdnhZFE0n1dhpRN4Kw7O9REugfGkPJUH+ cFEJSdi0l94Vsu26CvR7kuFoEGGZzrp0/8JuJ2NGSWtGE4aArpLBwPDytaOhV6aTn95iw/ F99GTh3erzlDSFz06V3nGqiVDYmg3mE4FXCXcc1m42W3BnInH+Jmp3pD6728czTe8h40Tr vngYEa2CKaASPwdSUnzxqXubgO6qB0unhrmJKVKATkfZjqI6Jr14C7Aa+LoSOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VJSmS4MHyzPZY; Tue, 16 Apr 2024 02:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43G2YW3t037120; Tue, 16 Apr 2024 02:34:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43G2YWFK037117; Tue, 16 Apr 2024 02:34:32 GMT (envelope-from git) Date: Tue, 16 Apr 2024 02:34:32 GMT Message-Id: <202404160234.43G2YWFK037117@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: ebdd5d72fffc - stable/14 - stand/loader.efi: fix regression with ignoring nvstore List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ebdd5d72fffcc92e1f046a7c5d9855b9566231e3 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ebdd5d72fffcc92e1f046a7c5d9855b9566231e3 commit ebdd5d72fffcc92e1f046a7c5d9855b9566231e3 Author: Gleb Smirnoff AuthorDate: 2023-09-11 18:04:48 +0000 Commit: Warner Losh CommitDate: 2024-04-16 02:32:03 +0000 stand/loader.efi: fix regression with ignoring nvstore To read/update the boot loader nvstore, we always need to call zfs_attach_nvstore() regardless of whether we use bootonce key in nvstore or the bootfs property of the pool. The call was unintentionally left in the block of code that is processed only when bootonce key is present. In particular this fixes broken 'nextboot -k'. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41795 Fixes: e3e2681d0ec28d6661fef6da76c9479049e2761c (cherry picked from commit d13550f0c9c283e6bf7a2a3ec870f92a882c9f21) --- stand/efi/loader/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 123410f83aa0..ca39c242afc3 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -264,8 +264,8 @@ probe_zfs_currdev(uint64_t guid) printf("zfs bootonce: %s\n", buf); set_currdev(buf); setenv("zfs-bootonce", buf, 1); - (void)zfs_attach_nvstore(&currdev); } + (void)zfs_attach_nvstore(&currdev); return (sanity_check_currdev()); }