openstack/devstack
Code Issues Proposed changes

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

Browse Source 
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
This commit is contained in:
Andrew Melton 2012-09-06 15:18:11 -04:00
parent c132625d1d
commit 98ab500c2c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/xen/prepare_guest_template.sh
View File

@ -49,7 +49,7 @@ ISO_DIR="/opt/xensource/packages/iso"
XS_TOOLS_FILE_NAME="xs-tools.deb" XS_TOOLS_FILE_NAME="xs-tools.deb"
XS_TOOLS_PATH="/root/$XS_TOOLS_FILE_NAME" XS_TOOLS_PATH="/root/$XS_TOOLS_FILE_NAME"
if [ -e "$ISO_DIR" ]; then 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 TMP_DIR=/tmp/temp.$RANDOM
mkdir -p $TMP_DIR mkdir -p $TMP_DIR
mount -o loop $TOOLS_ISO $TMP_DIR mount -o loop $TOOLS_ISO $TMP_DIR