From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST v2 13/19] standalone: Prefer ./standalone.config to $HOME/.xen-osstest/config Date: Thu, 18 Jun 2015 17:25:04 +0100 Message-ID: <1434644710-28881-13-git-send-email-ian.campbell@citrix.com> References: <1434644687.28264.53.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1434644687.28264.53.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org OSSTEST_CONFIG still trumps both. Signed-off-by: Ian Campbell --- standalone | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/standalone b/standalone index 17fa40c..ad12bad 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 standalone.config ]; then + config=standalone.config +else + config=$HOME/.xen-osstest/config +fi flight="standalone" host= reuse=1 # Don't blow away machines by default -- 2.1.4