Index: head/usr.sbin/bsdinstall/scripts/script
===================================================================
--- head/usr.sbin/bsdinstall/scripts/script	(revision 318631)
+++ head/usr.sbin/bsdinstall/scripts/script	(revision 318632)
@@ -1,137 +1,151 @@
 #!/bin/sh
 #-
 # Copyright (c) 2013 Nathan Whitehorn
 # Copyright (c) 2013-2015 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 ############################################################ INCLUDES
 
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
 f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/variable.subr
 
 ############################################################ CONFIGURATION
 
 # VARIABLES:
 # PARTITIONS
 # DISTRIBUTIONS
 # BSDINSTALL_DISTDIR
 
+#
+# Default name of the ZFS boot-pool
+#
+: ${ZFSBOOT_POOL_NAME:=zroot}
+
 ############################################################ GLOBALS
 
 #
 # Strings that should be moved to an i18n file and loaded with f_include_lang()
 #
 msg_installation_error="Installation Error!"
 
 ############################################################ FUNCTIONS
 
 error()
 {
-	[ -f "$PATH_FSTAB" ] && bsdinstall umount
-	
 	local file
 	f_getvar "$VAR_DEBUG_FILE#+" file
 	if [ "$file" ]; then
 		f_dialog_title "$msg_installation_error"
 		f_dialog_textbox "$file"
 		# No need to restore title, pining for the fjords
 	fi
 
+	[ -f "$PATH_FSTAB" ] || exit
+	if [ "$ZFSBOOT_DISKS" ]; then
+		zpool export $ZFSBOOT_POOL_NAME
+	else
+		bsdinstall umount
+	fi
+
 	exit 1
 }
 
 ############################################################ MAIN
 
 set -e
 trap error EXIT
 
 SCRIPT="$1"
 shift
 
 f_dprintf "Began Installation at %s" "$( date )"
 rm -rf $BSDINSTALL_TMPETC
 mkdir $BSDINSTALL_TMPETC
 
 split -a 2 -p '^#!.*' "$SCRIPT" /tmp/bsdinstall-installscript-
 
 . /tmp/bsdinstall-installscript-aa
 : ${DISTRIBUTIONS="kernel.txz base.txz"}; export DISTRIBUTIONS
 export BSDINSTALL_DISTDIR
 
 # Re-initialize a new log if preamble changed BSDINSTALL_LOG
 if [ "$BSDINSTALL_LOG" != "${debugFile#+}" ]; then
 	export debugFile="$BSDINSTALL_LOG"
 	f_quietly f_debug_init
 	# NB: Being scripted, let debug go to terminal for invalid debugFile
 	f_dprintf "Began Instalation at %s" "$( date )"
 fi
 
 # Make partitions
 rm -f $PATH_FSTAB
 touch $PATH_FSTAB
 if [ "$ZFSBOOT_DISKS" ]; then
 	bsdinstall zfsboot
 else
 	bsdinstall scriptedpart "$PARTITIONS"
+	bsdinstall mount
 fi
-bsdinstall mount
 
 # Unpack distributions
 bsdinstall checksum
 bsdinstall distextract
 
 # Finalize install
 bsdinstall config
 
 # Make sure networking is functional, if we can arrange that
 if [ ! -f $BSDINSTALL_CHROOT/etc/resolv.conf -a -f /etc/resolv.conf ]; then
 	cp /etc/resolv.conf $BSDINSTALL_CHROOT/etc/resolv.conf
 fi
 
 # Run post-install script
 if [ -f /tmp/bsdinstall-installscript-ab ]; then
 	cp /tmp/bsdinstall-installscript-ab $BSDINSTALL_CHROOT/tmp/installscript
 	chmod a+x $BSDINSTALL_CHROOT/tmp/installscript
 	mount -t devfs devfs "$BSDINSTALL_CHROOT/dev"
 	chroot $BSDINSTALL_CHROOT /tmp/installscript $@ 2>&1
 	umount "$BSDINSTALL_CHROOT/dev"
 	rm $BSDINSTALL_CHROOT/tmp/installscript
 fi
 
 bsdinstall entropy
-bsdinstall umount
+if [ "$ZFSBOOT_DISKS" ]; then
+	zpool export $ZFSBOOT_POOL_NAME
+else
+	bsdinstall umount
+fi
 
 f_dprintf "Installation Completed at %s" "$( date )"
 
 trap - EXIT
 exit $SUCCESS
 
 ################################################################################
 # END
 ################################################################################