From owner-svn-src-head@freebsd.org  Mon Jun 12 19:29:32 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73011C0AE20;
 Mon, 12 Jun 2017 19:29:32 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4187E7AFAC;
 Mon, 12 Jun 2017 19:29:32 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5CJTVfl050904;
 Mon, 12 Jun 2017 19:29:31 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5CJTVbI050903;
 Mon, 12 Jun 2017 19:29:31 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201706121929.v5CJTVbI050903@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: allanjude set sender to
 allanjude@FreeBSD.org using -f
From: Allan Jude <allanjude@FreeBSD.org>
Date: Mon, 12 Jun 2017 19:29:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r319863 - head/usr.sbin/bsdinstall/scripts
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jun 2017 19:29:32 -0000

Author: allanjude
Date: Mon Jun 12 19:29:31 2017
New Revision: 319863
URL: https://svnweb.freebsd.org/changeset/base/319863

Log:
  bsdinstall: Make ZFS min_auto_ashift adjustment persistent
  
  Reported by:	feld
  Reviewed by:	dteske, tsoome
  MFC after:	3 days
  Sponsored by:	ScaleEngine Inc.
  Differential Revision:	https://reviews.freebsd.org/D10895

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot	Mon Jun 12 19:13:29 2017	(r319862)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot	Mon Jun 12 19:29:31 2017	(r319863)
@@ -1443,6 +1443,12 @@ zfs_create_boot()
 	             'kern.geom.label.gptid.enable=\"0\"' \
 	             $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
 
+	if [ "$ZFSBOOT_FORCE_4K_SECTORS" ]; then
+		f_eval_catch $funcname echo "$ECHO_APPEND" \
+	             'vfs.zfs.min_auto_ashift=12' \
+	             $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
+	fi
+
 	if [ "$ZFSBOOT_SWAP_MIRROR" ]; then
 		f_eval_catch $funcname echo "$ECHO_APPEND" \
 		             'geom_mirror_load=\"YES\"' \