OSSTEST_CONFIG still trumps both. Signed-off-by: Ian Campbell <ian.campb...@citrix.com> --- v3: local-config not standalone.config --- standalone | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/standalone b/standalone index 17fa40c..0fb5ca4 100755 --- a/standalone +++ b/standalone @@ -68,7 +68,13 @@ TEMP=$(getopt -o c:f:h:rRs --long config:,flight:,host:,reuse,noreuse,reinstall, eval set -- "$TEMP" -config=${OSSTEST_CONFIG-$HOME/.xen-osstest/config} +if [ -n "${OSSTEST_CONFIG}" ]; then + config=${OSSTEST_CONFIG} +elif [ -f local-config ]; then + config=local-config +else + config=$HOME/.xen-osstest/config +fi flight="standalone" host= reuse=1 # Don't blow away machines by default -- 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel