From owner-svn-src-head@FreeBSD.ORG  Wed Dec  4 16:06:24 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 327CD60B;
 Wed,  4 Dec 2013 16:06:24 +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 1E7D51C8D;
 Wed,  4 Dec 2013 16:06:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB4G6NjY082662;
 Wed, 4 Dec 2013 16:06:23 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB4G6NGY082661;
 Wed, 4 Dec 2013 16:06:23 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201312041606.rB4G6NGY082661@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Wed, 4 Dec 2013 16:06:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258927 - 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.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Dec 2013 16:06:24 -0000

Author: dteske
Date: Wed Dec  4 16:06:23 2013
New Revision: 258927
URL: http://svnweb.freebsd.org/changeset/base/258927

Log:
  Fix a regression introduced by SVN r257842 that prevents Encryption from
  being enabled.
  
  MFC after:	3 days

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

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot	Wed Dec  4 16:06:11 2013	(r258926)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot	Wed Dec  4 16:06:23 2013	(r258927)
@@ -961,7 +961,7 @@ zfs_create_boot()
 	# If encryption is enabled, we need to create the GEOMs
 	#
 	if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
-		local bootvdev=
+		local bootvdev= options=
 		local geli_pool="$BSDINSTALL_CHROOT/$ZFSBOOT_GELI_POOL_NAME"
 		local key="$ZFSBOOT_GELI_KEY_FILE"
 
@@ -978,11 +978,13 @@ zfs_create_boot()
 		f_dprintf "$funcname: %s %s %s" \
 		          "ZFSBOOT_GELI_POOL_NAME=[$ZFSBOOT_GELI_POOL_NAME]" \
 		          "bootvdev=[$bootvdev]" "unenc_list=[$unenc_list]"
+		options="-o altroot=\"\$BSDINSTALL_CHROOT\""
+		options="$options -m \"/\$ZFSBOOT_GELI_POOL_NAME\""
+		options="$options -f"
 		f_eval_catch $funcname zpool "$ZPOOL_CREATE_WITH_OPTIONS" \
-		             "-o altroot=\"\$BSDINSTALL_CHROOT\"
-		              -m \"/\$ZFSBOOT_GELI_POOL_NAME\" -f" \
-		             \$ZFSBOOT_GELI_POOL_NAME \$bootvdev \
+		             "$options" \$ZFSBOOT_GELI_POOL_NAME \$bootvdev \
 		             \$unenc_list || return $FAILURE
+
 		f_dprintf "$funcname: geli_pool=[%s]" "$geli_pool"
 		f_eval_catch $funcname mkdir "$MKDIR_P" \$geli_pool/boot ||
 		             return $FAILURE