From owner-svn-src-all@FreeBSD.ORG  Mon Dec 16 19:54:55 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E42D2B4E;
 Mon, 16 Dec 2013 19:54:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D077614F7;
 Mon, 16 Dec 2013 19:54:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGJstPT091000;
 Mon, 16 Dec 2013 19:54:55 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGJsto3090999;
 Mon, 16 Dec 2013 19:54:55 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201312161954.rBGJsto3090999@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Mon, 16 Dec 2013 19:54:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259481 - 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-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Dec 2013 19:54:56 -0000

Author: dteske
Date: Mon Dec 16 19:54:55 2013
New Revision: 259481
URL: http://svnweb.freebsd.org/changeset/base/259481

Log:
  Auto-enable 4k sector alignment when disk encryption is requested (it is
  required in such a case). But don't prevent the user from pointing the
  gun at his/her foot -- you can disable 4k alignment after enabling geli).
  
  MFC after:	3 days

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

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot	Mon Dec 16 19:51:11 2013	(r259480)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot	Mon Dec 16 19:54:55 2013	(r259481)
@@ -1372,6 +1372,7 @@ while :; do
 		if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
 			ZFSBOOT_GELI_ENCRYPTION=
 		else
+			ZFSBOOT_GNOP_4K_FORCE_ALIGN=1
 			ZFSBOOT_GELI_ENCRYPTION=1
 		fi
 		;;