Date: Mon, 11 Feb 2013 23:27:40 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246699 - projects/portbuild/admin/tools Message-ID: <201302112327.r1BNRebK088753@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon (doc,ports committer) Date: Mon Feb 11 23:27:39 2013 New Revision: 246699 URL: http://svnweb.freebsd.org/changeset/base/246699 Log: Swap the order of some operations. No code changes. Modified: projects/portbuild/admin/tools/newmkportbuild Modified: projects/portbuild/admin/tools/newmkportbuild ============================================================================== --- projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 23:14:54 2013 (r246698) +++ projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 23:27:39 2013 (r246699) @@ -135,26 +135,12 @@ if [ -z "${mounted}" -o "${mounted}" = " fi chown ${SRCBUILD_USER} ${ZFS_MOUNTPOINT} 2> /dev/null -# (re)mount various subdirectories to be managed by srcbuild. -for subdir in ${SRCBUILD_OWNED_SUBDIRS}; do - mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}/${subdir}` - if [ -z "${mounted}" -o "${mounted}" = "no" ]; then - echo "ZFS volume ${ZFS_VOLUME}/${subdir} is not mounted. I'll (re)mount it for you." - zfs mount ${ZFS_VOLUME}/${subdir} || exit 1 - fi - chown ${SRCBUILD_USER} ${ZFS_MOUNTPOINT}/${subdir} 2> /dev/null -done - # delegate the "zfsportbuildadmin" permission set to the PORTBUILD_USER. zfs allow -du ${PORTBUILD_USER} @zfsportbuildadmin ${ZFS_VOLUME}/portbuild || exit 1 # delegate the "zfssnapadmin" permission set to the PORTBUILD_USER. zfs allow -du ${PORTBUILD_USER} @zfssnapadmin ${ZFS_VOLUME}/${SNAP_DIRECTORY} || exit 1 -echo "results of ZFS operations:" -zfs list ${ZFS_VOLUME} -zfs allow ${ZFS_VOLUME} - # (re)mount various subdirectories to be managed by portbuild. for subdir in ${PORTBUILD_OWNED_SUBDIRS}; do mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}/${subdir}` @@ -165,6 +151,20 @@ for subdir in ${PORTBUILD_OWNED_SUBDIRS} chown ${PORTBUILD_USER} ${ZFS_MOUNTPOINT}/${subdir} 2> /dev/null done +# (re)mount various subdirectories to be managed by srcbuild. +for subdir in ${SRCBUILD_OWNED_SUBDIRS}; do + mounted=`zfs list -H -t filesystem -o mounted ${ZFS_VOLUME}/${subdir}` + if [ -z "${mounted}" -o "${mounted}" = "no" ]; then + echo "ZFS volume ${ZFS_VOLUME}/${subdir} is not mounted. I'll (re)mount it for you." + zfs mount ${ZFS_VOLUME}/${subdir} || exit 1 + fi + chown ${SRCBUILD_USER} ${ZFS_MOUNTPOINT}/${subdir} 2> /dev/null +done + +echo "results of ZFS operations:" +zfs list ${ZFS_VOLUME} +zfs allow ${ZFS_VOLUME} + echo "checking out the repository as user ${PORTBUILD_USER} ..." su -m ${PORTBUILD_USER} -c "${VCS_CHECKOUT_COMMAND} ${VCS_PORTBUILD_REPOSITORY} ${ZFS_MOUNTPOINT}/portbuild" || exit 1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302112327.r1BNRebK088753>