From nobody Thu Sep 25 07:27:31 2025 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 4cXQKJ1Kgtz6838T; Thu, 25 Sep 2025 07:27:32 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cXQKJ0kTjz3SRR; Thu, 25 Sep 2025 07:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758785252; 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=MZ+ofQz1Eogr6vAYw9xjKEGU6Je1EjztGymxPjB2Zb8=; b=CRuq/2YzA6bKb5UnPiv6D7tjV9hzfzeoUmF/iixnruJxha+yW9moogreyFEMldDjxhrloJ zdvgZRhuafuadfiTtBOCy1W7V/mA2BrxcWiXUVjs10QRvOyGF7g9FgBy7EViPMKeeiaehR 0bhkX8lcG0qixu4LxV/1FiUgUFYj+btjU8gPlSNhD2Z+0BbXaBca++TYoYMwbhFrzN7aUb pOipk7XyQuM+WzkcX/LmBvCZSegtoD0HlLwkFpo8jVFQ471YzoB1anNUSMgDyIUB5u0cz+ FN8DxwFtvgjuzwsYYV7SfkoD63XS2p8UW0spIdDe+l+kxooSWNuGRywqWa1fPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758785252; 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=MZ+ofQz1Eogr6vAYw9xjKEGU6Je1EjztGymxPjB2Zb8=; b=sFtaLaEDw/rq5iP+bS/Tk8RYed2Y2hD+90e9B/6/SohIC1iRrlpvpvAfyh3iuiiaaCK1QM 2XHyZLA3WzZkhIfl3CEK02yA6q/g0WYQlE/1r8K6A/ckERL8NfMarjLwNM2Kgb2sk0ov8l tXOrX8+gleM1BGEoAH9u8HR0zg+3v/h9XZhVIzQ5dtPiNGOZ+tBK6lKf893yjX674MfTAH 9CL/MAKUBNwESgYvc71kAgQmEjigBTd6bTch6GesEiUsxfs5RU1wATXO1IxC/zUW95792p QoS1+qcT0th+KA2h2zWxwJ9gyxZDAU0r6MtNnJkyro+L8Y3GYxhggBP0gudxZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758785252; a=rsa-sha256; cv=none; b=dhYSFbwoLebkJm8UPDlKlf84C0l0Af8wTo6j485bhdrB5LpmDtDbOtIIcYWYLuAuOeTQcb ALMWq/zAKY9XAiaCa9YSc2IVDxaPYjuxf1hcud3XFONnJPZC2ikhEsLn2QnlzBg4j3CZMf ywWrYBkJ1pB/imAkMbXkrurXo/tyOcECdoRtZVUsb/3Im9kYw2ToM94ziRTB3Szyi6hkhK s09QLlCCLS25LfIEZ87Ck2yovyKVU8EaoIOeeYt6yAEuRq4tEC9eQfiXB11YovzVQpKcXI BByKdO+ZgA/KLR5DXkiqEbh2i8F7ukgKvxkaIOCABBXqMOAXfI70jGponZlBog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cXQKH6rXMz16CV; Thu, 25 Sep 2025 07:27:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58P7RVMG006052; Thu, 25 Sep 2025 07:27:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58P7RVXF006049; Thu, 25 Sep 2025 07:27:31 GMT (envelope-from git) Date: Thu, 25 Sep 2025 07:27:31 GMT Message-Id: <202509250727.58P7RVXF006049@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8f7dded41251 - stable/14 - bsdinstall: fix vfs.zfs.vdev.min_auto_ashift oid 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8f7dded412516d35e538ed05524d2a14870e62b0 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8f7dded412516d35e538ed05524d2a14870e62b0 commit 8f7dded412516d35e538ed05524d2a14870e62b0 Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Ed Maste CommitDate: 2025-09-25 07:26:55 +0000 bsdinstall: fix vfs.zfs.vdev.min_auto_ashift oid Signed-off-by: Siva Mahadevan 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) (cherry picked from commit 093f3f26e95198bf1db082763e915d7a53c6ba82) --- 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 8e3df4631abf..918e77db6a9d 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