Browse code
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
Andrew Melton authored on 2012/09/07 04:18:11Showing 1 changed files
| ... | ... |
@@ -49,7 +49,7 @@ ISO_DIR="/opt/xensource/packages/iso" |
| 49 | 49 |
XS_TOOLS_FILE_NAME="xs-tools.deb" |
| 50 | 50 |
XS_TOOLS_PATH="/root/$XS_TOOLS_FILE_NAME" |
| 51 | 51 |
if [ -e "$ISO_DIR" ]; then |
| 52 |
- TOOLS_ISO=$(ls $ISO_DIR/xs-tools-*.iso) |
|
| 52 |
+ TOOLS_ISO=$(ls -1 $ISO_DIR/xs-tools-*.iso | head -1) |
|
| 53 | 53 |
TMP_DIR=/tmp/temp.$RANDOM |
| 54 | 54 |
mkdir -p $TMP_DIR |
| 55 | 55 |
mount -o loop $TOOLS_ISO $TMP_DIR |