diff mbox

[Xen-devel,osstest.git] standalone: force an explicit default config

Message ID 1397471475-19122-1-git-send-email-ian.campbell@citrix.com
State New
Headers show

Commit Message

Ian Campbell April 14, 2014, 10:31 a.m. UTC
Some scripts (e.g. cri-args-hostlists) default to production-config instead of
the more expected ~/.xen-osstest/config. I keep forgetting this, so set the
more appropriate default in the helper script.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 standalone | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Ian Jackson April 14, 2014, 12:59 p.m. UTC | #1
Ian Campbell writes ("[PATCH osstest.git] standalone: force an explicit default config"):
> Some scripts (e.g. cri-args-hostlists) default to production-config instead of
> the more expected ~/.xen-osstest/config. I keep forgetting this, so set the
> more appropriate default in the helper script.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
diff mbox

Patch

diff --git a/standalone b/standalone
index 9f57cad..929fb4f 100755
--- a/standalone
+++ b/standalone
@@ -59,7 +59,7 @@  TEMP=$(getopt -o c:f:h:rR --long config:,flight:,host:,reuse,noreuse,reinstall,h
 
 eval set -- "$TEMP"
 
-config=
+config=$HOME/.xen-osstest/config
 flight="standalone"
 host=
 reuse=1 # Don't blow away machines by default
@@ -98,6 +98,11 @@  if [ ! -f standalone.db ] ; then
     exit 1
 fi
 
+if [ -z "$config" -o ! -r "$config" ] ; then
+    echo "Cannot read config." >&2
+    exit 1
+fi
+
 need_flight() {
     if [ -z "$flight" ] ; then
 	echo "run-job: Need a flight" >&2