From 1f8efd93d9e28cee2caf72267335126954bbb45e Mon Sep 17 00:00:00 2001 From: Armando Migliaccio Date: Sat, 2 Jun 2012 01:40:00 +0100 Subject: [PATCH] fix syntax error in the if test switch to using -f rather than -a. This has been overlooked in a review recently merged. Without this fix, devstack on XenServer is broken. Change-Id: I1882cc70528772287241848adea3a520738d4144 --- tools/xen/scripts/install-os-vpx.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/xen/scripts/install-os-vpx.sh b/tools/xen/scripts/install-os-vpx.sh index 7f2f3e6248..241296bd87 100755 --- a/tools/xen/scripts/install-os-vpx.sh +++ b/tools/xen/scripts/install-os-vpx.sh @@ -19,12 +19,7 @@ set -eux -if [ -a /etc/xensource-inventory] -then - . /etc/xensource-inventory -else - . /etc/xcp/inventory -fi +[[ -f "/etc/xensource-inventory" ]] && source "/etc/xensource-inventory" || source "/etc/xcp/inventory" NAME="XenServer OpenStack VPX" DATA_VDI_SIZE="500MiB"