commit 98ab500c2c9f1bd98309915643a44bf140a40391
author Andrew Melton <andrew.melton@rackspace.com> Thu Sep 06 15:18:11 2012 -0400
committer Andrew Melton <andrew.melton@rackspace.com> Wed Sep 12 14:06:47 2012 -0400
tree d56939f4d66a526baa75e3d1a688193a2aa7eaf9
parent c132625d1dcdc4d8ea824c0efb2b7428ab07341f

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

In the case of two iso's ('xs-tools-6.0.2.iso' and 'xs-tools-6.0.2-1111.iso'),
TOOLS_ISO gets set to 'xs-tools-6.0.2-1111.iso xs-tools-6.0.2.iso' This causes
'mount -o loop xs-tools-6.0.2-1111.iso xs-tools-6.0.2.iso $TMP_DIR' to get
called, which fails as it's meant to be called with only one file. This fix
simply sets TOOLS_ISO to the first iso that ls returns.

Change-Id: Id4d883e2b1e33b233c9ee907016b4ce117c28021

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