From owner-svn-src-projects@FreeBSD.ORG Sun Mar 24 16:53:08 2013 Return-Path: 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 DCC71265; Sun, 24 Mar 2013 16:53:08 +0000 (UTC) (envelope-from miwi@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 CFDF869E; Sun, 24 Mar 2013 16:53:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2OGr865047341; Sun, 24 Mar 2013 16:53:08 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2OGr8ao047340; Sun, 24 Mar 2013 16:53:08 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201303241653.r2OGr8ao047340@svn.freebsd.org> From: Martin Wilke Date: Sun, 24 Mar 2013 16:53:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r248688 - 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Mar 2013 16:53:08 -0000 Author: miwi Date: Sun Mar 24 16:53:08 2013 New Revision: 248688 URL: http://svnweb.freebsd.org/changeset/base/248688 Log: - hardcode zbase to fix client setup. Modified: projects/portbuild/scripts/setupnode Modified: projects/portbuild/scripts/setupnode ============================================================================== --- projects/portbuild/scripts/setupnode Sun Mar 24 16:51:21 2013 (r248687) +++ projects/portbuild/scripts/setupnode Sun Mar 24 16:53:08 2013 (r248688) @@ -108,7 +108,7 @@ postcopy() { if [ "${buildid}" != "-" -a "${branch}" != "-" ]; then mkdir -p ${wrkdir}/chroot if [ "${use_zfs}" -eq 1 ]; then - zbase=${scratchdir#/} + zbase=zroot/a zfs create ${zbase}/${branch} || true zfs create ${zbase}/${branch}/${buildid} || true zfs create ${zbase}/${branch}/${buildid}/world || true