Date: Mon, 11 Feb 2013 12:42:06 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246665 - projects/portbuild/admin/tools Message-ID: <201302111242.r1BCg68T093635@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon (doc,ports committer) Date: Mon Feb 11 12:42:06 2013 New Revision: 246665 URL: http://svnweb.freebsd.org/changeset/base/246665 Log: Checkpoint of changes to once again allow PORTBUILD_USER to clone from svn repositories. Submitted by: crees Modified: projects/portbuild/admin/tools/newmkportbuild Modified: projects/portbuild/admin/tools/newmkportbuild ============================================================================== --- projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 12:39:35 2013 (r246664) +++ projects/portbuild/admin/tools/newmkportbuild Mon Feb 11 12:42:06 2013 (r246665) @@ -79,6 +79,9 @@ zfs unallow -u ${SRCBUILD_USER} ${ZFS_VO # reset the "zfsportbuildadmin" permission set if it already exists. zfs unallow -s @zfsportbuildadmin ${ZFS_VOLUME} 2> /dev/null + +# reset the "zfssnapadmin" permission set if it already exists. +zfs unallow -s @zfssnapadmin ${ZFS_VOLUME} 2> /dev/null zfs unallow -u ${PORTBUILD_USER} ${ZFS_VOLUME} 2> /dev/null # create the "zfsalladmin" permission set. @@ -87,6 +90,9 @@ zfs allow -s @zfsalladmin ${ZFS_PERMISSI # create the "zfsportbuildadmin" permission set. zfs allow -s @zfsportbuildadmin ${ZFS_PERMISSIONSET} ${ZFS_VOLUME}/portbuild || exit 1 +# create the "zfssnapadmin" permission set. +zfs allow -s @zfssnapadmin ${ZFS_PERMISSIONSET_SNAPS} ${ZFS_VOLUME}/${SNAP_DIRECTORY} || exit 1 + # delegate the "zfsalladmin" permission set to the SRCBUILD_USER. zfs allow -du ${SRCBUILD_USER} @zfsalladmin ${ZFS_VOLUME} || exit 1 zfs allow -lu ${SRCBUILD_USER} @zfsalladmin ${ZFS_VOLUME} || exit 1 @@ -115,6 +121,9 @@ 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} @@ -137,6 +146,9 @@ done 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 +# XXX MCL now have to move some directories over, create different +# XXX MCL ownerships, and so forth. + echo "$0: you should now be able to edit files in ${ZFS_MOUNTPOINT}/portbuild/conf." # create convenience directories. failure is annoying but non-fatal.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302111242.r1BCg68T093635>