From owner-svn-src-projects@FreeBSD.ORG  Thu Feb 21 12:13:07 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3C9E71478;
 Thu, 21 Feb 2013 12:13:07 +0000 (UTC)
 (envelope-from erwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2FD312E3;
 Thu, 21 Feb 2013 12:13:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1LCD60j008402;
 Thu, 21 Feb 2013 12:13:06 GMT (envelope-from erwin@svn.freebsd.org)
Received: (from erwin@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1LCD6MS008401;
 Thu, 21 Feb 2013 12:13:06 GMT (envelope-from erwin@svn.freebsd.org)
Message-Id: <201302211213.r1LCD6MS008401@svn.freebsd.org>
From: Erwin Lansing <erwin@FreeBSD.org>
Date: Thu, 21 Feb 2013 12:13:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r247093 - projects/portbuild/admin/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Feb 2013 12:13:07 -0000

Author: erwin
Date: Thu Feb 21 12:13:06 2013
New Revision: 247093
URL: http://svnweb.freebsd.org/changeset/base/247093

Log:
  Fetch $ZFS_MOUNTPOINT from the environment instead of assuming
  it directly under "/${ZFS_VOLUME}"

Modified:
  projects/portbuild/admin/tools/mkportbuild

Modified: projects/portbuild/admin/tools/mkportbuild
==============================================================================
--- projects/portbuild/admin/tools/mkportbuild	Thu Feb 21 08:42:40 2013	(r247092)
+++ projects/portbuild/admin/tools/mkportbuild	Thu Feb 21 12:13:06 2013	(r247093)
@@ -11,6 +11,7 @@ DEFAULT_SRCBUILD_USER="srcbuild"
 DEFAULT_VCS_CHECKOUT_COMMAND="svn checkout"
 DEFAULT_VCS_REPOSITORY="svn://svn.FreeBSD.org"
 DEFAULT_ZFS_VOLUME="a"
+DEFAULT_ZFS_MOUNTPOINT="/a"
 DEFAULT_ZFS_PERMISSIONSET="clone,create,destroy,mount,promote,rename,rollback,send,share,snapshot"
 DEFAULT_ZFS_PERMISSIONSET_SNAPS="clone,snapshot"
 SNAP_DIRECTORY=snap
@@ -46,6 +47,10 @@ if [ ! `id -u ${SRCBUILD_USER} 2> /dev/n
   echo "User ${SRCBUILD_USER} must exist."
   exit 1
 fi
+if [ -z "${ZFS_MOUNTPOINT}" ]; then
+  echo "You must export ZFS_MOUNTPOINT, for example, export ZFS_MOUNTPOINT=${DEFAULT_ZFS_MOUNTPOINT}."
+  exit 1
+fi
 
 if [ -z "${VCS_CHECKOUT_COMMAND}" ]; then
   VCS_CHECKOUT_COMMAND="${DEFAULT_VCS_CHECKOUT_COMMAND}"
@@ -63,7 +68,6 @@ if [ -z "${ZFS_VOLUME}" ]; then
   echo "You must export ZFS_VOLUME, for example, export ZFS_VOLUME=${DEFAULT_ZFS_VOLUME}."
   exit 1
 fi
-ZFS_MOUNTPOINT="/${ZFS_VOLUME}"
 
 if [ -z "${ZFS_PERMISSIONSET}" ]; then
   echo "You have not set ZFS_PERMISSIONSET.  I will use the default: ${DEFAULT_ZFS_PERMISSIONSET}."