git: 093f3f26e951 - stable/15 - bsdinstall: fix vfs.zfs.vdev.min_auto_ashift oid

The branch stable/15 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=093f3f26e95198bf1db082763e915d7a53c6ba82

commit 093f3f26e95198bf1db082763e915d7a53c6ba82
Author:     Siva Mahadevan <me@svmhdvn.name>
AuthorDate: 2025-07-15 16:45:24 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2025-09-25 07:10:42 +0000

    bsdinstall: fix vfs.zfs.vdev.min_auto_ashift oid
    
    Signed-off-by: Siva Mahadevan <me@svmhdvn.name>
    PR: 266374
    Pull request: https://github.com/freebsd/freebsd-src/pull/1851
    Reviewed by: emaste
    Sponsored by: The FreeBSD Foundation
    
    (cherry picked from commit 87a7b35f04b60956e9aa192680ae80773ec38f14)
---
 usr.sbin/bsdinstall/scripts/zfsboot | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot
index aa05faa7d3dd..5fbf56ea59ac 100755
--- a/usr.sbin/bsdinstall/scripts/zfsboot
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -69,7 +69,7 @@ f_include $BSDCFG_SHARE/variable.subr
 : ${ZFSBOOT_VDEV_TYPE:=stripe}
 
 #
-# Should we use sysctl(8) vfs.zfs.min_auto_ashift=12 to force 4K sectors?
+# Should we use sysctl(8) vfs.zfs.vdev.min_auto_ashift=12 to force 4K sectors?
 #
 : ${ZFSBOOT_FORCE_4K_SECTORS=1}
 
@@ -221,7 +221,7 @@ PRINTF_CONF="printf '%s=\"%%s\"\\\n' %s >> \"%s\""
 PRINTF_FSTAB='printf "$FSTAB_FMT" "%s" "%s" "%s" "%s" "%s" "%s" >> "%s"'
 SHELL_TRUNCATE=':> "%s"'
 SWAP_GMIRROR_LABEL='gmirror label swap %s'
-SYSCTL_ZFS_MIN_ASHIFT_12='sysctl vfs.zfs.min_auto_ashift=12'
+SYSCTL_ZFS_MIN_ASHIFT_12='sysctl vfs.zfs.vdev.min_auto_ashift=12'
 UMOUNT='umount "%s"'
 ZFS_CREATE_WITH_OPTIONS='zfs create %s "%s"'
 ZFS_MOUNT='zfs mount "%s"'
@@ -255,7 +255,7 @@ msg_encrypt_disks="Encrypt Disks?"
 msg_encrypt_disks_help="Use geli(8) to encrypt all data partitions"
 msg_error="Error"
 msg_force_4k_sectors="Force 4K Sectors?"
-msg_force_4k_sectors_help="Align partitions to 4K sector boundries and set vfs.zfs.min_auto_ashift=12"
+msg_force_4k_sectors_help="Align partitions to 4K sector boundries and set vfs.zfs.vdev.min_auto_ashift=12"
 msg_freebsd_installer="$OSNAME Installer"
 msg_geli_password="Enter a strong passphrase, used to protect your encryption keys. You will be required to enter this passphrase each time the system is booted"
 msg_geli_setup="Initializing encryption on selected disks,\n this will take several seconds per disk"
@@ -1099,7 +1099,7 @@ zfs_create_boot()
 	#
 	f_dprintf "$funcname: Preparing disk partitions for ZFS pool..."
 
-	# Force 4K sectors using vfs.zfs.min_auto_ashift=12
+	# Force 4K sectors using vfs.zfs.vdev.min_auto_ashift=12
 	if [ "$ZFSBOOT_FORCE_4K_SECTORS" ]; then
 		f_dprintf "$funcname: With 4K sectors..."
 		f_eval_catch $funcname sysctl "$SYSCTL_ZFS_MIN_ASHIFT_12" \
@@ -1382,7 +1382,7 @@ zfs_create_boot()
 
 	if [ "$ZFSBOOT_FORCE_4K_SECTORS" ]; then
 		f_eval_catch $funcname echo "$ECHO_APPEND" \
-	             'vfs.zfs.min_auto_ashift=12' \
+	             'vfs.zfs.vdev.min_auto_ashift=12' \
 	             $BSDINSTALL_TMPETC/sysctl.conf.zfs || return $FAILURE
 	fi