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

[Devin Teske]

Author: dteske
Date: Sun Feb 16 06:56:44 2014
New Revision: 261960
URL: http://svnweb.freebsd.org/changeset/base/261960

Log:
  Add zfsboot to the scripted interface of bsdinstall(8); oops!
  NB: If the zfsboot variables ($ZFSBOOT_*) are set, a script is
  assumed to want zfsboot module instead of scriptedpart module.
  
  Submitted by:	Loïc Brarda <loic.brarda at cern.ch>
  Reviewed by:	nwhitehorn@
  MFC after:	3 days

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

Modified: head/usr.sbin/bsdinstall/scripts/script
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/script	Sun Feb 16 04:11:40 2014	(r261959)
+++ head/usr.sbin/bsdinstall/scripts/script	Sun Feb 16 06:56:44 2014	(r261960)
@@ -95,7 +95,11 @@ fi
 # Make partitions
 rm -f $PATH_FSTAB
 touch $PATH_FSTAB
-bsdinstall scriptedpart "$PARTITIONS"
+if [ "$ZFSBOOT_DISKS" ]; then
+	bsdinstall zfsboot
+else
+	bsdinstall scriptedpart "$PARTITIONS"
+fi
 bsdinstall mount
 
 # Unpack distributions