From nobody Mon Sep 11 18:05:22 2023 X-Original-To: dev-commits-src-main@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 4Rkvl66v00z4stg9; Mon, 11 Sep 2023 18:05:22 +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 4Rkvl66Rzhz4g6Z; Mon, 11 Sep 2023 18:05:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694455522; 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=OgwVdFmZLgBrVkExRx1rev4lipMm+u+drLW1bpXC/Xc=; b=GvS8NHvmZdJqUqXaUoUsDFCrh+Deu4nLtNqGteLFG+qaHiUTemO3amfej9DPAK5RjWOySv 4WExJvgJB3ILGPp6FWjQdqXLRDDay/prg7H0ZQIIecDfhfFkIrTGBdfTcITGkfUf+EVr8v bP4yhwXelUSc+t+xQPZXKT53YZal3k1NI5q0jcbQk0EvmR4qZcJzT/GCHIWvcqHNCvV7eu VD8/3GjVqRa+8QKSslge6ie77b6FupEQfAOszAmctWdEjJYvWb7FHqfol/wA0NkYAR9/cQ nuY6mBXSrOfjzTbS6kgCRshl8ighjCtv5Q7UbIAerUFZ3sjy4wvyxs3Womm2uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694455522; a=rsa-sha256; cv=none; b=UDxMsYu0UCSfyb2QxYJJnvE7M4EZsKNrMf0vHSBNi4/oycG8SQFr1eyoQg0BtaGUdknDjm XXWjY+sT0KLNK9OMVaW5RjOcKfWDy5erD7nQnYkK7LklALfbOsnzqsZCPP7U3g5K+1WZSw 5ioxJb1dMgzgy/0R0PW+Px64LxaE9HgFftBPr0i9hFkFEPusnPeu2mve6NDO0jWQdqHpn+ nlQpqfbp+PkGM2p6rFQgOd27dMSTQVf3QjXhL8GnAdixcM3V9STKTtyforfYheQhN8vgZP aOxbSgxgFoqszNoxrfgBpwFkGOUyLby29/lAQQCaGd2HmVGVSrs9YsxflkFazA== 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=1694455522; 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=OgwVdFmZLgBrVkExRx1rev4lipMm+u+drLW1bpXC/Xc=; b=d4+6MepXnM4YN9V0PXFba04aSSSY0X2zEzUo91n9m4ofdJlgjrM5hqtEm5qjzlSHYZcOI3 GlL7JzJamH/UHBUleSAPFW4WwjwAYruk1yCIG5NIM2sG3nVSCQNgb3+R0Pap6j35zjOV4d x/8PUqxmFEMj9bb4Fpw37K/dKkLj/gqEXiw0U2yJTnLIxe3RJFNct0tKa0i30RzXiErRzC QF31ek0zbN6+v7ABGdpf4NX2uhmfhWrXEEvRwS8i28e/1vYQY9ehKfEmnjjOkjGXl4YsRA DjScGW967r0uxIOqJNIkEdlRZqj/lrKjdKL0puupKYs/Y/T1E1Tok0u4HYAgig== 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 4Rkvl65PPBz10Pp; Mon, 11 Sep 2023 18:05:22 +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 38BI5MUC007417; Mon, 11 Sep 2023 18:05:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BI5M9Y007414; Mon, 11 Sep 2023 18:05:22 GMT (envelope-from git) Date: Mon, 11 Sep 2023 18:05:22 GMT Message-Id: <202309111805.38BI5M9Y007414@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: d13550f0c9c2 - main - stand/loader.efi: fix regression with ignoring nvstore List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d13550f0c9c283e6bf7a2a3ec870f92a882c9f21 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d13550f0c9c283e6bf7a2a3ec870f92a882c9f21 commit d13550f0c9c283e6bf7a2a3ec870f92a882c9f21 Author: Gleb Smirnoff AuthorDate: 2023-09-11 18:04:48 +0000 Commit: Gleb Smirnoff CommitDate: 2023-09-11 18:04:48 +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 --- 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 39e32a56adc0..11b10dd44d5e 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()); }