From 68f294873c82859ca4e118bb1e420b91a057530e Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova@opennebula.org>
Date: Thu, 13 Sep 2012 17:00:14 +0200
Subject: [PATCH] feature #1437: Not care if the 'just-in-case' delete fails

---
 src/tm_mad/vmware/delete  | 3 +++
 src/tm_mad/vmware/mkimage | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/tm_mad/vmware/delete b/src/tm_mad/vmware/delete
index 78ec0bd785..93fed2b274 100755
--- a/src/tm_mad/vmware/delete
+++ b/src/tm_mad/vmware/delete
@@ -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
diff --git a/src/tm_mad/vmware/mkimage b/src/tm_mad/vmware/mkimage
index d824b8660f..a194980623 100755
--- a/src/tm_mad/vmware/mkimage
+++ b/src/tm_mad/vmware/mkimage
@@ -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