From nobody Thu Sep 25 07:11:25 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 4cXPyk0225z681NG; Thu, 25 Sep 2025 07:11:26 +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 4cXPyj6Q8Dz3RKJ; Thu, 25 Sep 2025 07:11:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758784285; 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=hUVsJcEJann5a1YubCwZje1Tym1Vn8e5KB3RgrnyoWg=; b=pvQPEbLKFVDr6QlIZjWdHDojbqFoz+LrUupcZLkgHjvkV5e5BOEJAX5c2DPJPb60aDTojW lhpmjqjB1XuZo1hEWlo+OE4ruWb0sImdjTEm9d+67WXB+VCw60NzZh2OR5AyJQeNoeacOS 4HG6+anzg4Wn6RvlU5PAPskyfY3BwDm+JAZzKiFYD9NvQ3FaxhbVRjMFUtTUQl2MyBWEvh NtxwFejjxf2VAByWNWrLJiQG687aiD9+doMdvY1nC/iOkHy6jhoDGdH/LsipLOqLTbVvSt 9W7Y2EwQ9v7DZUjxK2ab1ZUyO3Tw2Ii0G+/P79octR5UUUxKxMltu47UY6Vwxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758784285; 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=hUVsJcEJann5a1YubCwZje1Tym1Vn8e5KB3RgrnyoWg=; b=C4x7LiXlOEHc+jb9OUxxZO7xqHpbRmymg0mjDXtNE/znu0Vx7Uy12QheydtwVUCS0cebby gV8PvTMA9EIckWnZ3KXn4EmVmizIKmQ+bl9JWbU4tsYkIgC7XsNMIKIxOlkc4IkEm57jz/ EUZMvwnVRdjRYwd6QcZQ778bRh8r0kgrVIkvcae14Z/GPfv8w2SKFqO7zrjSPV7XjzRocD cu0lp4PYgzX+yJuqQrHmGpUGGI4/is7xS3YddHHF6xHBjiZhxiShYb4Q61bGS7KGH3N0M/ ocSTBXZSuYaKM5yaUcPAjQQPvnGn2DQpHrpsdmPRRGhp9nq2move96pkMtS16g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758784285; a=rsa-sha256; cv=none; b=bW8huTlwbDgahog4K2eR4eftBeeQZKmKanMT5ywQTAPrATDVDeG5xwOZ16WDxXkWOXFtta WkixFR0VYch8JhQOB0DKXCuehpQqwkHhl8UxxKyCCmY8LHyeFhI6uJ3GqH+lnMwKPUkE7q pgXyOvy0aoIVtSm6jT4vB/t6M6f5xQ/qToldiWyi2+NsfAsvlkeJqKQmCQ80nCGueJRJoq eylCNA/tdjveKxmVMRbC4Eev1DOVGK9DEXgb7ojF8OlKQO1QqmZYXRWz58EkhKibApng4a GBCywzVGZnN5Mevo/q7DNo/Oc6UqwgdB65P3KLk1cVJ528jmBHUlNGeJAGytZQ== 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 4cXPyj5zgxz16Vs; Thu, 25 Sep 2025 07:11:25 +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 58P7BPOs082208; Thu, 25 Sep 2025 07:11:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58P7BPX9082205; Thu, 25 Sep 2025 07:11:25 GMT (envelope-from git) Date: Thu, 25 Sep 2025 07:11:25 GMT Message-Id: <202509250711.58P7BPX9082205@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: 093f3f26e951 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 093f3f26e95198bf1db082763e915d7a53c6ba82 Auto-Submitted: auto-generated The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=093f3f26e95198bf1db082763e915d7a53c6ba82 commit 093f3f26e95198bf1db082763e915d7a53c6ba82 Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Ed Maste CommitDate: 2025-09-25 07:10:42 +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) --- 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