svn commit: r257507 - stable/10/usr.sbin/bsdinstall/scripts

[Glen Barber]

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
 	#