commit 4d6cea68fa2adafe3678e9dff22cdb706b3f27e5
author Jenkins <jenkins@review.openstack.org> Wed Sep 12 21:04:44 2012 +0000
committer Gerrit Code Review <review@openstack.org> Wed Sep 12 21:04:44 2012 +0000
tree e2be651175f55e4760579660ba1f8be8c05ebfd7
parent eff0c6cf19680b28e1afe3deab55ba01151bfa7e
parent 98ab500c2c9f1bd98309915643a44bf140a40391

Merge "prepare_guest_template.sh fails when there are multiple xs-tools iso's in ISO_DIR"

tools/xen/prepare_guest_template.sh

diff --git a/tools/xen/prepare_guest_template.sh b/tools/xen/prepare_guest_template.sh
index 60782d0..baf9c3a 100755
--- a/tools/xen/prepare_guest_template.sh
+++ b/tools/xen/prepare_guest_template.sh
@@ -49,7 +49,7 @@
 XS_TOOLS_FILE_NAME="xs-tools.deb"
 XS_TOOLS_PATH="/root/$XS_TOOLS_FILE_NAME"
 if [ -e "$ISO_DIR" ]; then
-    TOOLS_ISO=$(ls $ISO_DIR/xs-tools-*.iso)
+    TOOLS_ISO=$(ls -1 $ISO_DIR/xs-tools-*.iso | head -1)
     TMP_DIR=/tmp/temp.$RANDOM
     mkdir -p $TMP_DIR
     mount -o loop $TOOLS_ISO $TMP_DIR