From owner-svn-src-all@FreeBSD.ORG  Sun Feb 16 06:56:44 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ACC7A491;
 Sun, 16 Feb 2014 06:56:44 +0000 (UTC)
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 976DD1489;
 Sun, 16 Feb 2014 06:56:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1G6uime065849;
 Sun, 16 Feb 2014 06:56:44 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1G6uipp065848;
 Sun, 16 Feb 2014 06:56:44 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201402160656.s1G6uipp065848@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Sun, 16 Feb 2014 06:56:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261960 - head/usr.sbin/bsdinstall/scripts
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Feb 2014 06:56:44 -0000

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@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