From nobody Fri Sep 19 16:03:14 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 4cSy3655skz68C9M; Fri, 19 Sep 2025 16:03:14 +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 4cSy364W33z43m1; Fri, 19 Sep 2025 16:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758297794; 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=j3YMlMahfLVZxWc1KI0+/4I7dW2kpRMqq+G1MykUWIw=; b=mx+z0zKweCwzM22EU0Do0CcUTcE4bq5KxZ/KtzqCbshAJ50J8B7tQIJgF/lHi/A333Pifr PRDPH+oHLUV4vpfjhSQ1NIr3q3xm7YyNtGdKn53lbtZi5XkkX12taTgnebwtoS/L2BmoV6 TwLktCzlu3bZQ8mhAMxSxlFXFyzm4Ub1YzeKHKY3CqAHi7r2TbOgNKuxtuMGjoN135LkXx fKDN6yl9guB0NTlPv87mf8DmV4VuJgG+zQSz68pSs19XKmS5xrJJHgwDCzRCYy9zriXt3u 8LgMXCh0MbCluYiVU6qZIDUlurd8M5XqRvVyDWaoPezDN23aQuyR+78T9hJDZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758297794; 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=j3YMlMahfLVZxWc1KI0+/4I7dW2kpRMqq+G1MykUWIw=; b=eVgOmNJRx3+J11yqMkgT95ujBDsRgzjEFx6H/Emp0tuqkQk5xdx6fLmeIijIhjFOLEfPA+ TcORZWW2jAeLFCDrxJW0RUMazL9bD8y1KFNGeJkOT8szYgkZNpd8JbcqNwL6ligtt0bfnm 8s5yYKgETxw8eWx9dVmlzBsJzEend6qpgd/+IaasEpkNx2EZ23qrlE9LVAFQdtt7gb0PyM XVPVEAGWnismALX9jnaEYa/2FQoI8jPipw4NG2d/hyShyS7PjRg0HN4X68G4fPmBUcOkzl W8xxHLcROISBihhlCcaekx9tOK6xVt2vFT+uxH+ppfFWMhZR7cSH2cqu6wsd8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758297794; a=rsa-sha256; cv=none; b=qJ0Yvl3J9kDKQYvCyl5uwAFRzBPDGDKNLi9TmZU2xpgQmdqUreCIUrq6XY6+7Ov+Vs0VEI DVMkOt0sZ+TUtkZ1Jz39VD1rNmvTF52oyHtzSSMkCsTSUnqn6H7wTmox7gtrUWNyXA3mZT GrXBn9AQgY27u/jbYR7p0kmq7S52p8tWbvdcwTvf8B7rE4zady2sRklqT7i15SyggY1T1O dLnLHP/6nUoklUGb1UpGlo9teiicD+Gu9rWgJBgUfBfM8oXXr8420lulfwrErDHooi2+eV Q9AMw/5kFMQ75wo0DWLNCbQni/Z0s88yaLoGNc/YzalHcK6fbu0aufQMAfpJ6Q== 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 4cSy3644vjz14DZ; Fri, 19 Sep 2025 16:03:14 +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 58JG3Eud037441; Fri, 19 Sep 2025 16:03:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58JG3EF6037438; Fri, 19 Sep 2025 16:03:14 GMT (envelope-from git) Date: Fri, 19 Sep 2025 16:03:14 GMT Message-Id: <202509191603.58JG3EF6037438@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 87a7b35f04b6 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 87a7b35f04b60956e9aa192680ae80773ec38f14 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=87a7b35f04b60956e9aa192680ae80773ec38f14 commit 87a7b35f04b60956e9aa192680ae80773ec38f14 Author: Siva Mahadevan AuthorDate: 2025-07-15 16:45:24 +0000 Commit: Ed Maste CommitDate: 2025-09-19 16:02:57 +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 --- 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