svn commit: r247093 - projects/portbuild/admin/tools

[Erwin Lansing]

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}."