Date: Mon, 31 Dec 2012 15:45:00 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r244909 - projects/portbuild/scripts Message-ID: <201212311545.qBVFj0gs057839@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212311545.qBVFj0gs057839>