svn commit: r259148 - head/usr.sbin/bsdinstall/scripts

[Devin Teske]

Author: dteske
Date: Mon Dec  9 23:58:26 2013
New Revision: 259148
URL: http://svnweb.freebsd.org/changeset/base/259148

Log:
  Fix a regression introduced by SVN r257842; resulting in mountroot prompt
  after attempting to install to encrypted ZFS root (caused by a typo in a
  variable name -- ZFSBOOT_BOOT_FSNAME -> ZFSBOOT_BOOTFS_NAME).
  
  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  9 23:54:48 2013	(r259147)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot	Mon Dec  9 23:58:26 2013	(r259148)
@@ -1190,7 +1190,7 @@ zfs_create_boot()
 	f_eval_catch $funcname echo "$ECHO_APPEND" 'geom_eli_load=\"YES\"' \
 	    \$BSDINSTALL_TMPBOOT/loader.conf.geli || return $FAILURE
 	f_eval_catch $funcname printf "$PRINTF_CONF" vfs.root.mountfrom \
-	    '"zfs:$poolname/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOT_FSNAME"' \
+	    '"zfs:$poolname/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME"' \
 	    \$BSDINSTALL_TMPBOOT/loader.conf.root || return $FAILURE
 	f_dprintf "$funcname: disks=[%s]" "$disks"
 	for disk in $disks; do