svn commit: r246703 - projects/portbuild/tools
Mark Linimon
linimon at FreeBSD.org
Tue Feb 12 03:19:40 UTC 2013
Author: linimon (doc,ports committer)
Date: Tue Feb 12 03:19:39 2013
New Revision: 246703
URL: http://svnweb.freebsd.org/changeset/base/246703
Log:
Follow the split of server.conf into server.conf and admin.conf. While
here, stamp out some other lies, and comment out code that can take eons
to run.
Modified:
projects/portbuild/tools/addarch
Modified: projects/portbuild/tools/addarch
==============================================================================
--- projects/portbuild/tools/addarch Tue Feb 12 03:14:47 2013 (r246702)
+++ projects/portbuild/tools/addarch Tue Feb 12 03:19:39 2013 (r246703)
@@ -21,6 +21,12 @@ usage () {
exit 1
}
+if [ ! -e ${pbc}/admin/conf/admin.conf ] ; then
+ echo "You must first create ${pbc}/admin/conf/admin.conf."
+ exit 1
+fi
+. ${pbc}/admin/conf/admin.conf
+
if [ ! -e ${pbc}/conf/server.conf ] ; then
echo "You must first create ${pbc}/conf/server.conf."
exit 1
@@ -42,7 +48,7 @@ for i in ${SUPPORTED_ARCHS}; do
fi
done
if [ $valid_arch = 0 ]; then
- echo "You must first add ${arch} to SUPPORTED_ARCHS in ${pbc}/conf/server.conf."
+ echo "You must first add ${arch} to SUPPORTED_ARCHS in ${pbc}/admin/conf/admin.conf."
echo "Currently supported archs are: ${SUPPORTED_ARCHS}."
exit 1
fi
@@ -50,7 +56,8 @@ fi
if [ ! -z "${PORTBUILD_USER}" ]; then
uid=${PORTBUILD_USER}
else
- uid=ports-${arch}
+ echo "You must first define PORTBUILD_USER in ${pbc}/admin/conf/admin.conf."
+ exit 1
fi
if [ ! -z "${PORTBUILD_GROUP}" ]; then
gid=${PORTBUILD_GROUP}
@@ -64,8 +71,8 @@ archfs=${ZFS_VOLUME}/portbuild/${arch}
if ! test_fs "${archfs}"; then
echo "The ${archfs} filesystem does not exist. I'll create and mount it for you."
zfs create ${archfs} || exit 1
- chown -R ${uid}:${gid} ${archdir} || exit 1
- chmod -R g+w ${archdir} || exit 1
+# chown -R ${uid}:${gid} ${archdir} || exit 1
+# chmod -R g+w ${archdir} || exit 1
fi
loads=${archdir}/loads
More information about the svn-src-projects
mailing list