Date: Sat, 18 Nov 2023 19:21:08 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: de82aed11924 - main - bsdinstall zfsboot: Don't override ZFSBOOT_FORCE_4K_SECTORS if it is null. Message-ID: <202311181921.3AIJL8xp008058@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=de82aed1192470574a08d3e479d81c4c1280487a commit de82aed1192470574a08d3e479d81c4c1280487a Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2023-11-18 19:18:29 +0000 Commit: John Baldwin <jhb@FreeBSD.org> 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 <bugs.freebsd.org@a12l.xyz> 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?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311181921.3AIJL8xp008058>