svn commit: r246662 - projects/portbuild/admin/etc/rc.d

[Mark Linimon]

Author: linimon (doc,ports committer)
Date: Mon Feb 11 12:10:24 2013
New Revision: 246662
URL: http://svnweb.freebsd.org/changeset/base/246662

Log:
  Suggested bugfixes from crees.

Modified:
  projects/portbuild/admin/etc/rc.d/pollmachine
  projects/portbuild/admin/etc/rc.d/qmanager

Modified: projects/portbuild/admin/etc/rc.d/pollmachine
==============================================================================
--- projects/portbuild/admin/etc/rc.d/pollmachine	Mon Feb 11 11:33:56 2013	(r246661)
+++ projects/portbuild/admin/etc/rc.d/pollmachine	Mon Feb 11 12:10:24 2013	(r246662)
@@ -8,20 +8,21 @@
 
 export PATH=/usr/local/bin:${PATH}
 
-pb=/var/portbuild
+pb=${portbuild_base:-/a/portbuild}
 config_file=${pb}/conf/server.conf
 
 if [ ! -f ${config_file} ]; then
   echo "$0: ${config_file} must exist!"
   exit 1
 fi
+
+. ${config_file}
+
 if [ -z "${PORTBUILD_USER}" ]; then
   echo "$0: You must define PORTBUILD_USER in ${config_file}."
   exit 1
 fi
 
-. ${config_file}
-
 case $1 in
     start)
         s=${pb}/scripts/pollmachine

Modified: projects/portbuild/admin/etc/rc.d/qmanager
==============================================================================
--- projects/portbuild/admin/etc/rc.d/qmanager	Mon Feb 11 11:33:56 2013	(r246661)
+++ projects/portbuild/admin/etc/rc.d/qmanager	Mon Feb 11 12:10:24 2013	(r246662)
@@ -8,20 +8,21 @@
 
 export PATH=/usr/local/bin:${PATH}
 
-pb=/var/portbuild
+pb=${portbuild_base:-/a/portbuild}
 config_file=${pb}/conf/server.conf
 
 if [ ! -f ${config_file} ]; then
   echo "$0: ${config_file} must exist!"
   exit 1
 fi
+
+. ${config_file}
+
 if [ -z "${PORTBUILD_USER}" ]; then
   echo "$0: You must define PORTBUILD_USER in ${config_file}."
   exit 1
 fi
 
-. ${config_file}
-
 case $1 in
     start)
         s=${pb}/qmanager/qmanager.py