From nobody Fri Jan 05 00:23:14 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 4T5kh26rDFz55fTM; Fri, 5 Jan 2024 00:23:14 +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 4T5kh25Dtdz4dtb; Fri, 5 Jan 2024 00:23:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704414194; 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=u9Hjf8ArRgyYR9Qlselp/jhYvFyHYRBIj95cBceaDaw=; b=YNy5qImikV3+a0wsUZLnN3isXknz/YSOSdsGlZD/cR71VI4zS5cgBWWl65jmewOXm0x7u9 pmk6hx0PfJykFJWZJmkoyJ9hy+7LHyCdQVsDPmoMOWi3k9L2w1VhkPw/6koZtyeJXkBwYm Vg0cp5HCsTwXCuuRHhJJxfQyPh5/IsGh47Nk+D9CluMuEU3b4iXcQ/6kGQ8ijmQs2GZQmn U0+uybg9Ib5h9XONv9ou9KfhdDWSTsrEEJ2b+EpyQUEDxhWOfxrdP9Tn1BE+Fzja1oF+se uDJOJecR0qePaoN+0UUgdwnlQo8DCEhdZbK8FDG3W6lQTHpQwNTf8ATVyLx7MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704414194; 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=u9Hjf8ArRgyYR9Qlselp/jhYvFyHYRBIj95cBceaDaw=; b=GgjkNBs/TXjPPEt+7ERn+iF6g5+mvzELcJTyHnhc9GvSx1hx5DZ4Hd63PAj8wKPGJ+C3nb YC61xFZJB2ESxBEoYDNUJd9yzNoRjFftbB4nhQR0Byv82cccNHTxgPMZjn8HueEJzBufWb 0g3gjcFfvDWJEtp6vGBacHov6nUW3vpp82b2hsPsgnAJSGY47id7AR2GhY51+ftzeeRFsD giyL7Jk8MR8KwLiUZjBUsti7S8rtD+ToumODTK8EFjMCiyCsXmmLF4tUzglaZrYtUTpk2r SSwuXklzyzixUGXcUAYlasZkOmWC1QIz8vsupbiK2ZhccAT5Xb9oEzxdMAIoIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704414194; a=rsa-sha256; cv=none; b=MhEmtXBxLsOE2q4avw4jaHd/myKss7jHPoXEU1tT8hwwVSPWiOqCZSQCYVyRA8bhWK8v1Q di65ksVDdFAkM6qlRWo77ch/G0DJc+pdCyczx6QDETwjmXbR61ZgJDhhCvrrUTFOvPFmW3 ohQOMTnhRVV8RvTmFxGvyiHU4HM/t2JSqF8L5esLbeGr9Skn2nePzFz1LgNYq5kxUqRBFb 7Ml0u3CFY5nGwpi99sJmzGYjWEe2umOaok3m4o2IfXRMjVSAl5XeJ66ksmdm7JwfWIb2RC 2ozyY0WhqfYRILs/UFvIZncHJO556Y5bJjFJVkCuyPeVjH9+MNpAgCtgMGf29g== 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 4T5kh24KnBzbCq; Fri, 5 Jan 2024 00:23:14 +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 4050NE4H025695; Fri, 5 Jan 2024 00:23:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4050NEgx025692; Fri, 5 Jan 2024 00:23:14 GMT (envelope-from git) Date: Fri, 5 Jan 2024 00:23:14 GMT Message-Id: <202401050023.4050NEgx025692@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: a463db46a11c - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: a463db46a11ce84da39206c493ab0c4c02c29eb1 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a463db46a11ce84da39206c493ab0c4c02c29eb1 commit a463db46a11ce84da39206c493ab0c4c02c29eb1 Author: John Baldwin AuthorDate: 2023-11-18 19:18:29 +0000 Commit: John Baldwin CommitDate: 2024-01-05 00:21:59 +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 7028ee9ced91..bd7db75dc5e5 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -66,7 +66,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?