diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2023-11-18 19:18:29 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2024-01-05 00:21:59 +0000 |
| commit | a463db46a11ce84da39206c493ab0c4c02c29eb1 (patch) | |
| tree | ecd95c5106c468d2ffae8536710ea14ff348f881 | |
| parent | e0f29ad461d8473ad96c37e5d494833958f72844 (diff) | |
| download | src-a463db46a11ce84da39206c493ab0c4c02c29eb1.tar.gz src-a463db46a11ce84da39206c493ab0c4c02c29eb1.zip | |
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 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? |