@@ -183,10 +183,8 @@ if [ -z "$templateuuid" ]; then

         # Copy the tools DEB to the XS web server

         XS_TOOLS_URL="https://github.com/downloads/citrix-openstack/warehouse/xe-guest-utilities_5.6.100-651_amd64.deb"

         ISO_DIR="/opt/xensource/packages/iso"

-        XS_TOOLS_FILE_NAME="xs-tools.deb"

-        XS_TOOLS_PATH="/root/$XS_TOOLS_FILE_NAME"

         if [ -e "$ISO_DIR" ]; then

-            TOOLS_ISO=$(ls -1 $ISO_DIR/xs-tools-*.iso | head -1)

+            TOOLS_ISO=$(ls -1 $ISO_DIR/*-tools-*.iso | head -1)

             TMP_DIR=/tmp/temp.$RANDOM

             mkdir -p $TMP_DIR

             mount -o loop $TOOLS_ISO $TMP_DIR