From nobody Thu Sep 25 14:42:02 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 4cXbyf2SK2z68c3t; Thu, 25 Sep 2025 14:42:02 +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 4cXbyf1WJrz3QL3; Thu, 25 Sep 2025 14:42:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758811322; 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=oNOzuxLagEmG0EDTsBgxWLswm3CpteaDcnnHHzNvz4o=; b=DejYirgBx+MNga/zk8Xxe/PFSitfovzuz9tdqvqp6lMa+QdoGUi7exjekUAZcm51cA/3DQ mRc890iwpvw8Pbz2oQclMFeObFyOQ3IUyjUored8Bqh9eQoJ/dFGDSnncZ3Io9UMt5UQ+D Q7mXBbEgQDMiOPmy2iG8yFRvc7uvkkD2QHX3+QR5mYJuz15nkidQXO1g1J1LZOq+Pok7qW 8sgaMpDLOu4SAt+pfjMwfvbXU+CrmJ7g/eaTAVxghK5c+s1Yd2wVN2EMyPdqRVGcXEmOOO UDomarKyqzeO5Kq/p8tjkbcWWXOurWBseumFiJBBY+TJyKLjZ14uBkTnXGiduw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758811322; 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=oNOzuxLagEmG0EDTsBgxWLswm3CpteaDcnnHHzNvz4o=; b=iL1xQsP85EmAAjktzuUF7kPE0wCSeXMgZlIilnRstdOO/nCOmVSwzqQj0o/j6AfOrblzW6 gnGUJf0JHn99of51RQHDLWkQD4P81EZKL/Vvg3Q5wsvEISIc5ruiLuny8QQLQAScDujdmB op84921XYQfSvkyc5vaz4hjNjGUAA0wFPRQVD0bpkcWXy+kVAGUnD93Tb2UccJYBcL67Bl doIz+ZOph/S0cTdgagevgSQTmV3ccGSRa4sqU4gOYqOMBHknfKyBtnMJCMHwgPeB0FtrCc O6HaFuE34MdwVvSCWJSDffBIGSVRgEeTbJf9D7nAwqrtePNeVyLs3S7UoY9EgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758811322; a=rsa-sha256; cv=none; b=Fuy/zheP1K601zSdmT/q/wuWOTMwUjPAIa9NQCT5QHF3vUNCaDdiO9cLPJKMVgune+Pw8P yOl6mylEQw19RqXmV03CaOdcV1pE8cvMx4+iliGpRXMFLDXSGlfmR/mqF7y8yfgAp9Nuqa aFv4h+4deYamEYtbtM9z+N4nOM2+HNEMoypZ+PB9cRyPLrAduihoXP+qQnlt8SgOg6IraH 1Kp3TCMMPBaAyV/LHVknI8d7N1Nm3FB0gej/y31AQLUvZcYLQ3lJcaZdj+JuqS7+3NlZLq nkE6vfJAL2qPBT43MOuvoT+itjgpFrB7iGIixV6n+PSb2G/J2a1b1kwYUmChNg== 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 4cXbyf0vYcz1LJh; Thu, 25 Sep 2025 14:42:02 +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 58PEg2HS031536; Thu, 25 Sep 2025 14:42:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58PEg2OM031533; Thu, 25 Sep 2025 14:42:02 GMT (envelope-from git) Date: Thu, 25 Sep 2025 14:42:02 GMT Message-Id: <202509251442.58PEg2OM031533@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: 7e42cedae894 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 7e42cedae894c8910d95cefa2490235628243b2c Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7e42cedae894c8910d95cefa2490235628243b2c commit 7e42cedae894c8910d95cefa2490235628243b2c Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Ed Maste CommitDate: 2025-09-25 14:41:33 +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) (cherry picked from commit 8f7dded412516d35e538ed05524d2a14870e62b0) --- 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 aa0c2648911f..8eebc5367729 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -64,7 +64,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} @@ -216,7 +216,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"' @@ -250,7 +250,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="FreeBSD 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" @@ -1151,7 +1151,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" \ @@ -1460,7 +1460,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