From owner-svn-src-projects@FreeBSD.ORG  Mon Dec 31 15:45:00 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 BC89FD8F;
 Mon, 31 Dec 2012 15:45:00 +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 A1DA58FC0C;
 Mon, 31 Dec 2012 15:45:00 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBVFj08A057842;
 Mon, 31 Dec 2012 15:45:00 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBVFj0gs057839;
 Mon, 31 Dec 2012 15:45:00 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201212311545.qBVFj0gs057839@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 31 Dec 2012 15:45:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244909 - projects/portbuild/scripts
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: Mon, 31 Dec 2012 15:45:00 -0000

Author: linimon (doc,ports committer)
Date: Mon Dec 31 15:44:59 2012
New Revision: 244909
URL: http://svnweb.freebsd.org/changeset/base/244909

Log:
  Make these behave properly in the brave new worlds of zfs delegation.

Modified:
  projects/portbuild/scripts/updatesnap
  projects/portbuild/scripts/updatesnap.ports

Modified: projects/portbuild/scripts/updatesnap
==============================================================================
--- projects/portbuild/scripts/updatesnap	Mon Dec 31 15:37:17 2012	(r244908)
+++ projects/portbuild/scripts/updatesnap	Mon Dec 31 15:44:59 2012	(r244909)
@@ -42,30 +42,24 @@ fi
 # create /a/snap if not already there
 if [ ! -d ${base} ]; then
   echo "creating new base directory using ${base}"
-  mkdir -p ${base} || finish 1
-  echo "zfs create -o mountpoint=${base} ${zbase}"
-  zfs create -o mountpoint=${base} ${zbase} || finish 1
+  zfs create ${zbase} || finish 1
   chown -R ${uid}:${gid} ${base}
   chmod -R g+w ${base}
 fi
 
 for branch in $SRC_BRANCHES; do
-  mountpoint=${base_prefix}${branch}
   # create /a/snap/src-<branch> if not already there
+  mountpoint=${base_prefix}${branch}
   if [ ! -d ${mountpoint} ]; then
     echo "creating new source branch using ${mountpoint}"
-    mkdir ${mountpoint} || finish 1
-    echo "zfs create -o mountpoint=${mountpoint} ${zbase_prefix}${branch}"
-    zfs create -o mountpoint=${mountpoint} ${zbase_prefix}${branch} || finish 1
+    zfs create ${zbase_prefix}${branch} || finish 1
     chown -R ${uid}:${gid} ${mountpoint}
     chmod -R g+w ${mountpoint}
   fi
   # create /a/snap/src-<branch>/src if not already there
   if [ ! -d ${mountpoint}/src ]; then
     echo "creating new source branch subdirectory using ${mountpoint}/src"
-    mkdir ${mountpoint}/src || finish 1
-    echo "zfs create -o mountpoint=${mountpoint}/src ${zbase_prefix}${branch}/src"
-    zfs create -o mountpoint=${mountpoint}/src ${zbase_prefix}${branch}/src || finish 1
+    zfs create ${zbase_prefix}${branch}/src || finish 1
     chown -R ${uid}:${gid} ${mountpoint}/src
     chmod -R g+w ${mountpoint}/src
   fi

Modified: projects/portbuild/scripts/updatesnap.ports
==============================================================================
--- projects/portbuild/scripts/updatesnap.ports	Mon Dec 31 15:37:17 2012	(r244908)
+++ projects/portbuild/scripts/updatesnap.ports	Mon Dec 31 15:44:59 2012	(r244909)
@@ -42,9 +42,7 @@ fi
 # create /a/snap/ if not already there
 if [ ! -d ${base} ]; then
   echo "creating new base directory using ${base}"
-  mkdir -p ${base} || finish 1
-  echo "zfs create -o mountpoint=${base} ${zbase}"
-  zfs create -o mountpoint=${base} ${zbase} || finish 1
+  zfs create ${zbase} || finish 1
   chown -R ${uid}:${gid} ${base}
   chmod -R g+w ${base}
 fi
@@ -52,9 +50,7 @@ fi
 # create /a/snap/ports-head/ if not already there
 if [ ! -d ${head} ]; then
   echo "creating new ports-head directory using ${head}"
-  mkdir ${head} || finish 1
-  echo "zfs create -o mountpoint=${head} ${zhead}"
-  zfs create -o mountpoint=${head} ${zhead} || finish 1
+  zfs create ${zhead} || finish 1
   chown -R ${uid}:${gid} ${head}
   chmod -R g+w ${head}
 fi
@@ -62,9 +58,7 @@ fi
 # create /a/snap/ports-head/ports/ if not already there
 if [ ! -d ${head}/ports ]; then
   echo "creating new ports-head/ports directory using ${head}/ports"
-  mkdir ${head}/ports || finish 1
-  echo "zfs create -o mountpoint=${head}/ports ${zhead}/ports"
-  zfs create -o mountpoint=${head}/ports ${zhead}/ports || finish 1
+  zfs create ${zhead}/ports || finish 1
   chown -R ${uid}:${gid} ${head}/ports
   chmod -R g+w ${head}/ports
 fi