allow instance specific settings

cri-args-hostlists and invoke-daemon now check for
$HOME/.xen-osstest/settings which can contain things like "export
OSSTEST_CONFIG=production-config-cambridge" to tailor things for a
particular instance of osstest running in production mode.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
[ ijc -- add invoke-daemon too and reword commit message accordingly ]

diff --git a/cri-args-hostlists b/cri-args-hostlists
index 04cd6be140926914240526c0eaa51c98bfb889dc..08e733dad8f572726aafa47034cff99c8ce75971 100644 (file)
--- a/cri-args-hostlists
+++ b/cri-args-hostlists
@@ -16,7 +16,9 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
+if [ -e $HOME/.xen-osstest/settings ]; then
+     source $HOME/.xen-osstest/settings
+fi
 export OSSTEST_CONFIG=${OSSTEST_CONFIG:-production-config}
 
 check_stop_core () {

diff --git a/invoke-daemon b/invoke-daemon
index c1177ca8067cda33555a2315706ff36cf6476650..60067984c02da51f2c78def83ff05fb745b1cfa9 100755 (executable)
--- a/invoke-daemon
+++ b/invoke-daemon
@@ -16,8 +16,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+if [ -e $HOME/.xen-osstest/settings ]; then
+     source $HOME/.xen-osstest/settings
+fi
+export OSSTEST_CONFIG=${OSSTEST_CONFIG:-production-config}
 
-export OSSTEST_CONFIG=production-config
 
 cd "${0%/*}"
 if [ "x$2" != x ]; then sleep $2; fi