diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2023-11-18 19:18:29 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2024-01-03 20:18:50 +0000 |
| commit | 904ebc903cbe4f528a7e65f694d11cbdebcc353a (patch) | |
| tree | 6aca176879c82539aea3aac0ba7b44af0b3295b3 | |
| parent | b636e35bb724b9c777fed6c7cf4a713d14316f36 (diff) | |
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
(cherry picked from commit de82aed1192470574a08d3e479d81c4c1280487a)
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/zfsboot | 2 |
1 files changed, 1 insertions, 1 deletions
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? |