feature #1437: Not care if the 'just-in-case' delete fails

This commit is contained in:
Tino Vazquez committed 2012-09-13 17:00:14 +02:00
1 parent a3aca6f2e1
commit 68f294873c
2 files changed
+4 -1

No files matched your search

+3
View File
@@ -27,6 +27,9 @@ DST=$1
VMID=$2
DSID=$3
# Wait for the cancel action on the VM to complete
sleep 10
if [ -z "${ONE_LOCATION}" ]; then
TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
VMWARERC=/etc/one/vmwarerc
+1 -1
View File
@@ -81,7 +81,7 @@ else
vifs $VI_PARAMS --mkdir [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER
VMWARE_DISK_TYPE=`echo $FSTYPE|cut -d'_' -f 2`
exec_and_log "$VMKFSTOOLS $VI_PARAMS -U $DST_PATH/disk.vmdk"
$VMKFSTOOLS $VI_PARAMS -U [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk &> /dev/null
exec_and_log "$VMKFSTOOLS $VI_PARAMS -c ${SIZE}M -d ${VMWARE_DISK_TYPE} [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk" \
"Cannot create [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk on $DST_HOST"
fi