From nobody Sat Nov 18 19:21:08 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 4SXkC86p2yz51VXY; Sat, 18 Nov 2023 19:21:08 +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 4SXkC86M1Gz4Lv1; Sat, 18 Nov 2023 19:21:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700335268; 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=fceUoUBRWbSD7O4JG25L9KHZKjEV+ryzczwBbpfnmFs=; b=hGpsA7E9MbfBbvcW40Z7FkNFFnBRHzWHweRbY7MzG7Jwrr+H4+5OKCKjPJ+FBl+btez2y8 nt/lJgxvwBzkGH8CZeeAAIlDJ3sJvRxjRItOfwiKtLZymXw4eFRAeBfHDQ8uCB7pI1BL07 akYzDT2QYXcF+e4TJOOxqgiNppCnra2FAB1nq/LSAmizvs2+pK3dO4ORVlYlK6BsIYcRUa jh1TR6AfHXG/SwycPD94FvBShw/1rgoEN5oxn143eJeD3dK2ePwu9zhdBa2t1SsnIRY/os MEM3iR4Rxcg4wYlzJdHf4JwcHDHD5wUtXDsv+icSG/jdWfIZ4xUxzQeyxwHb8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700335268; 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=fceUoUBRWbSD7O4JG25L9KHZKjEV+ryzczwBbpfnmFs=; b=umButC1MoEGyxA5Qi9x3RQaSupMbBaRpqmkmoYfEoWWOyXfge09V51WqRd9ifZRyTa7y1x UmFw89/8wGX0Kl42+bPATREpHFtr/5LZeQ2fFJfhtbc5eqYqQ3bD9887+JUBmxJ4GaKffd k7mHMwbS7CXZk8Gtsqm/yMERUa8tfSPgWH+JBcrGoj7UFzGi/uhs+hAQ+sCT1l4BXbckl7 z29YQKOSaq2Mf9O9h63l/AlO7xlak7xK15m1JdN+uGzVitOS20WUSzNK5XGMCszTz6OMT6 dd3bI2AKM3MdyxaCCrMV+zFUu+Qllc+jQBB2vagQi/pbvDJ9oLGKyPgS9KiqvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700335268; a=rsa-sha256; cv=none; b=q7S+vmaEMvxnB35uaR7bt+nXCnT2hmPnyMNxcSZXQwC12pCHKLn3THFE3RHiXXdl/CLzP2 cozCLv0v77B0LQKqypOXcIUJi66YycD92ka/EQB9aK8YWVpsGClH0ooAAzJ7Gv6QmCnnqu Lh0EWOyPB+4byWr6x5tILgy6IDJogjZEmd301Cb0qwtqESAzQtS8pFxL+8D9rO7+Ez9pSm Y5Kto4CNXYcErQL+n1mlRL8E/AseVdeFuF6Wkx+9D/dttLyKg+Czy3EYXVbBA0BjjXI6uW np/COMc1o+bWHvSYNQh0pZk+5nuNkz/Av85ikMWStJC964MZN99JiLvANK59ww== 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 4SXkC85LyTzf4V; Sat, 18 Nov 2023 19:21:08 +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 3AIJL8O4008077; Sat, 18 Nov 2023 19:21:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AIJL8xp008058; Sat, 18 Nov 2023 19:21:08 GMT (envelope-from git) Date: Sat, 18 Nov 2023 19:21:08 GMT Message-Id: <202311181921.3AIJL8xp008058@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: de82aed11924 - main - bsdinstall zfsboot: Don't override ZFSBOOT_FORCE_4K_SECTORS if it is null. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de82aed1192470574a08d3e479d81c4c1280487a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=de82aed1192470574a08d3e479d81c4c1280487a commit de82aed1192470574a08d3e479d81c4c1280487a Author: John Baldwin AuthorDate: 2023-11-18 19:18:29 +0000 Commit: John Baldwin CommitDate: 2023-11-18 19:18:29 +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 --- 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 619d11c56000..1d38db2d0f15 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?