From nobody Wed Jan 03 20:33:21 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 4T51dF4rthz56f4G; Wed, 3 Jan 2024 20:33:21 +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 4T51dF4DCBz4MdW; Wed, 3 Jan 2024 20:33:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704314001; 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=fmMp6S86/pIb9iRMME46+zwxvEeqBAOMQ9jM86AaWzA=; b=mAz7sDIyAAenDFefpd6V+yMJobJABE6STg0aAoiE+1NKkabqRuVkTc5ht0eCG+7iws0WfM Mg+zMYMe0lG9u1eN8C2PGa+VZVyurxfz5iIBZjvt+anMV+DlQdLhD1KiGYTErcY+F9ECBm Mu8/DHCXNRj4PUXKr6P9/o5Nbn9OaB7MXhI/pL3pkEyt0MZNyDqxxeBPcZxqsy/XTx9QCd GQNKKDxYlAaMDWnbAkpDEK7QZVDY7strJqRTr+CrKSOMju67rw4h2uTrW2S/AVZzzVvjHh xO/S3m4/X+KNA1nsrlT8zKy8uN2dPcoxtUJrEonEZbVo4up/7QwZuH8arAp3RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704314001; 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=fmMp6S86/pIb9iRMME46+zwxvEeqBAOMQ9jM86AaWzA=; b=e6ouXrkTxa4OdzO6FrbPRU5hsuzOxlL/UD9yQD0Pg3D7J+xwTxwTxBRQ/3u+nSmUFeSCGk y/uRe7SSfA9NakOJvRF+LdZbz1sAp6XjZD8LB5SZoQofgl3LZ2Jfs19QzHg6NWj1yIMjJq d2eru10CwaJRbMMaPqpsPjsCpEJrcGSTjw7sgmSvN8hIANY7ZBU+uLgOZHuOlXRyFL+112 Pe+ZDCQ5xNq3g+2dKWLyzDRFv6RAz6lriGFTx2UvBe+1YW3q6qw0Ps7V3YNRaab+p1XnYG PQU+omLxhz/MvfNNgg+pMW1F/iJ4zFfnBo4Lwgtynsz8ejT6pETCJS0SXNevGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704314001; a=rsa-sha256; cv=none; b=r5YLEjvr3Xc5bcaUqVb0rFY+AkslsfsbKB3WlbZloxNLJfFF6JNzDvByEnsespVCOKEI+T mWbOG+2EH44PgPxPWsLuAiFMrzYwvPEPo6jM6J4cv3sx+UQZRsFADvJPd1sMLTr6JUpSfV o2K5I16hXYivReWsZqJRgIMq/oZfLf5UIXmtLr34hsHJQpXOhSrzqO8ub26gL20zJhCV7b tBdVWbSsT9y8Ku/vQA9n00cGTbGeCdmMYhUm2nNfxJ6kXQgeuMXGujik3vSSTOF7bMpBUI acde9Lzjzdl2U6UWMLCy0mWUtJXdG65XvZLuy0sExJ7CslqP8kHcNW/13L21XA== 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 4T51dF3J59z10gB; Wed, 3 Jan 2024 20:33:21 +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 403KXLIa020601; Wed, 3 Jan 2024 20:33:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403KXLMf020598; Wed, 3 Jan 2024 20:33:21 GMT (envelope-from git) Date: Wed, 3 Jan 2024 20:33:21 GMT Message-Id: <202401032033.403KXLMf020598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 904ebc903cbe - stable/14 - bsdinstall zfsboot: Don't override ZFSBOOT_FORCE_4K_SECTORS if it is null. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 904ebc903cbe4f528a7e65f694d11cbdebcc353a Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=904ebc903cbe4f528a7e65f694d11cbdebcc353a commit 904ebc903cbe4f528a7e65f694d11cbdebcc353a Author: John Baldwin AuthorDate: 2023-11-18 19:18:29 +0000 Commit: John Baldwin CommitDate: 2024-01-03 20:18:50 +0000 bsdinstall zfsboot: Don't override ZFSBOOT_FORCE_4K_SECTORS if it is null. Only set a default value of 1 if the shell variable is unset. This allows installer scripts to disable the variable. PR: 274513 Reported by: Albin "a12l" Otterhäll Differential Revision: https://reviews.freebsd.org/D42319 (cherry picked from commit de82aed1192470574a08d3e479d81c4c1280487a) --- usr.sbin/bsdinstall/scripts/zfsboot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index a671841b15e5..e7fd59d5c8b3 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -71,7 +71,7 @@ f_include $BSDCFG_SHARE/variable.subr # # Should we use sysctl(8) vfs.zfs.min_auto_ashift=12 to force 4K sectors? # -: ${ZFSBOOT_FORCE_4K_SECTORS:=1} +: ${ZFSBOOT_FORCE_4K_SECTORS=1} # # Should we use geli(8) to encrypt the drives?