From owner-svn-src-stable-10@FreeBSD.ORG  Fri Nov  1 15:54:58 2013
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@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 ESMTP id 1564FF3B;
 Fri,  1 Nov 2013 15:54:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
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 00BAE25F3;
 Fri,  1 Nov 2013 15:54:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1Fsv8h046945;
 Fri, 1 Nov 2013 15:54:57 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA1FsvcC046944;
 Fri, 1 Nov 2013 15:54:57 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201311011554.rA1FsvcC046944@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 1 Nov 2013 15:54:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r257507 - stable/10/usr.sbin/bsdinstall/scripts
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Nov 2013 15:54:58 -0000

Author: gjb
Date: Fri Nov  1 15:54:57 2013
New Revision: 257507
URL: http://svnweb.freebsd.org/changeset/base/257507

Log:
  MFC r256540, r256544:
  
   r256540 (dteske):
   Add loader.conf(5) entries to import bootpool after boot when
   using full-disk encryption and ZFS.
  
   r256544 (dteske):
   Fix loader.conf(5) entries from r256540.
  
  Approved by:	re (hrs)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.sbin/bsdinstall/scripts/zfsboot
Directory Properties:
  stable/10/usr.sbin/bsdinstall/   (props changed)

Modified: stable/10/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- stable/10/usr.sbin/bsdinstall/scripts/zfsboot	Fri Nov  1 13:57:30 2013	(r257506)
+++ stable/10/usr.sbin/bsdinstall/scripts/zfsboot	Fri Nov  1 15:54:57 2013	(r257507)
@@ -802,7 +802,7 @@ zfs_create_boot()
 	zpool set cachefile=$BSDINSTALL_CHROOT/boot/zfs/zpool.cache \
 		"$poolname" || return $FAILURE
 
-	# Last, but not least... add required lines to rc.conf(5)
+	# Last, but not least... required lines for rc.conf(5)/loader.conf(5)
 	# NOTE: We later concatenate these into their destination
 	echo 'zfs_enable="YES"' > $BSDINSTALL_TMPETC/rc.conf.zfs ||
 		return $FAILURE
@@ -812,6 +812,14 @@ zfs_create_boot()
 	# We're all done unless we should go on to do encryption
 	[ "$ZFSBOOT_GELI_ENCRYPTION" ] || return $SUCCESS
 
+	# Some additional GELI requirements for loader.conf(5)
+	echo 'zpool_cache_load="YES"' \
+		>> $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
+	echo 'zpool_cache_type="/boot/zfs/zpool.cache"' \
+		>> $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
+	echo 'zpool_cache_name="/boot/zfs/zpool.cache"' \
+		>> $BSDINSTALL_TMPBOOT/loader.conf.zfs || return $FAILURE
+
 	#
 	# Configure geli(8)-based encryption
 	#