From 73a2e4aded827f90f577ba4947a36c0447754f8e Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova@opennebula.org>
Date: Mon, 5 Nov 2012 21:22:21 +0100
Subject: [PATCH] bug #1636: Fix for VMFS TM Clone using SSH

---
 src/tm_mad/vmfs/clone | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/tm_mad/vmfs/clone b/src/tm_mad/vmfs/clone
index 1202009243..9260fb31d7 100755
--- a/src/tm_mad/vmfs/clone
+++ b/src/tm_mad/vmfs/clone
@@ -65,7 +65,7 @@ vmfs_set_up
 #-------------------------------------------------------------------------------
 
 if [ "$USE_SSH" == "yes" ]; then
-	ssh_make_path $DST_HOST $DST_PATH
+  ssh_make_path $DST_HOST /vmfs/volumes/$SYSTEM_DS_NAME/$VMID/$DST_FOLDER
 else
   vmfs_create_double_path $SYSTEM_DS_NAME $VMID $DST_FOLDER
 fi
@@ -78,20 +78,17 @@ log "Cloning $SRC_PATH in $DST"
 if [ "$USE_SSH" == "yes" ]; then
 
 CLONESCRIPT=$(cat <<EOF
-cd $DST_DIR
-
 export PATH=/usr/sbin:/sbin:\$PATH
 
 if which sudo > /dev/null; then
   SUDO_CMD="sudo "
 fi
 
-\$SUDO_CMD $VMKFSTOOLS -U $DST_PATH/disk.vmdk
-\$SUDO rm $DST_PATH/*
-\$SUDO_CMD $VMKFSTOOLS -i $SRC_PATH/disk.vmdk -d thin $DST_PATH/disk.vmdk
+\$SUDO_CMD $VMKFSTOOLS -U /vmfs/volumes/$SYSTEM_DS_NAME/$VMID/$DST_FOLDER/disk.vmdk
+\$SUDO_CMD $VMKFSTOOLS -i /vmfs/volumes/$IMAGE_DS_NAME/$SRC_FOLDER/disk.vmdk -d thin /vmfs/volumes/$SYSTEM_DS_NAME/$VMID/$DST_FOLDER/disk.vmdk
 EOF
 )
-	ssh_exec_and_log $DST_HOST "$CLONESCRIPT" "Error cloning $SRC to $DST"
+  ssh_exec_and_log $DST_HOST "$CLONESCRIPT" "Error cloning $SRC to $DST"
 else
   $VMKFSTOOLS $VI_PARAMS -U [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk &> /dev/null
 
@@ -101,8 +98,9 @@ else
     vifs $VI_PARAMS --force --rm [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/$file
   done
 
-	exec_and_log "$VMKFSTOOLS $VI_PARAMS -i [$IMAGE_DS_NAME]$SRC_FOLDER/disk.vmdk -d thin [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk" \
+  exec_and_log "$VMKFSTOOLS $VI_PARAMS -i [$IMAGE_DS_NAME]$SRC_FOLDER/disk.vmdk -d thin [$SYSTEM_DS_NAME]$VMID/$DST_FOLDER/disk.vmdk" \
                  "Error cloning $SRC to $DST"
 fi
 
 exit 0
+