From owner-svn-src-projects@FreeBSD.ORG  Tue Dec 18 01:13:25 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E7B1D6F0;
 Tue, 18 Dec 2012 01:13:25 +0000 (UTC)
 (envelope-from linimon@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 140658FC19;
 Tue, 18 Dec 2012 01:13:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBI1DOaK018882;
 Tue, 18 Dec 2012 01:13:24 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBI1DOIT018881;
 Tue, 18 Dec 2012 01:13:24 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212180113.qBI1DOIT018881@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Tue, 18 Dec 2012 01:13:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244371 - projects/portbuild/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: Tue, 18 Dec 2012 01:13:26 -0000

Author: linimon (doc,ports committer)
Date: Tue Dec 18 01:13:24 2012
New Revision: 244371
URL: http://svnweb.freebsd.org/changeset/base/244371

Log:
  Make more robust.  Remove cruft.

Modified:
  projects/portbuild/tools/zfsadmin

Modified: projects/portbuild/tools/zfsadmin
==============================================================================
--- projects/portbuild/tools/zfsadmin	Tue Dec 18 00:25:48 2012	(r244370)
+++ projects/portbuild/tools/zfsadmin	Tue Dec 18 01:13:24 2012	(r244371)
@@ -6,8 +6,6 @@
 pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
 pbd=${PORTBUILD_DATA:-/var/portbuild}
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:${pbc}/scripts
-
 if [ `id -u` != 0 ]; then
     echo "$0 must be run as root."
     exit 1
@@ -31,11 +29,15 @@ if [ -z "${PORTBUILD_USER}" ]; then
     exit 1
 fi
 
+# reset the "zfsadmin" permission set if it already exists. 
+zfs unallow -s @zfsadmin ${ZFS_VOLUME} 2> /dev/null   
+zfs unallow -u ${PORTBUILD_USER} ${ZFS_VOLUME} 2> /dev/null
+
 # create the "zfsadmin" permission set.
-zfs allow -s @zfsadmin ${ZFS_PERMISSIONSET} ${ZFS_VOLUME}
+zfs allow -s @zfsadmin ${ZFS_PERMISSIONSET} ${ZFS_VOLUME} || exit 1
 
-# delegate the "zfsadmin" permission set to the PORTBUILD_USER.
-zfs allow -u ${PORTBUILD_USER} @zfsadmin ${ZFS_VOLUME}
+# delegate the "zfsadmin" permission set to the PORTBUILD_USER. 
+zfs allow -u ${PORTBUILD_USER} @zfsadmin ${ZFS_VOLUME} || exit 1
 
 echo "result of operation:"
 zfs allow ${ZFS_VOLUME}