From a5dd6ca26549f7affa884dc7775ecf3f87426699 Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova@opennebula.org>
Date: Fri, 25 Oct 2013 17:50:59 +0200
Subject: [PATCH] Feature #2393: Fix for empty CLONE_FSTYPE in vmfs clone (no
 -d left behind)

---
 src/datastore_mad/remotes/vmfs/clone | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/datastore_mad/remotes/vmfs/clone b/src/datastore_mad/remotes/vmfs/clone
index 0fc78ed657..7411a4bf82 100755
--- a/src/datastore_mad/remotes/vmfs/clone
+++ b/src/datastore_mad/remotes/vmfs/clone
@@ -66,7 +66,7 @@ BRIDGE_LIST="${XPATH_ELEMENTS[j++]}"
 DS_ID="${XPATH_ELEMENTS[j++]}"
 SRC="${XPATH_ELEMENTS[j++]}"
 IMAGE_TYPE="${XPATH_ELEMENTS[j++]}"
-CLONE_FSTYPE="-d ${XPATH_ELEMENTS[j++]}"
+CLONE_FSTYPE="${XPATH_ELEMENTS[j++]}"
 
 
 # ------------------------------------------------------------------------------
@@ -103,6 +103,10 @@ if ! is_cdrom; then
     exec_and_log "ssh_make_path $DST_HOST $DST" \
                  "Cannot create $DST in $DST_HOST"
 
+    if [ -n $CLONE_FSTYPE ]; then
+        CLONE_FSTYPE="-d $CLONE_FSTYPE"
+    fi
+
     ssh_exec_and_log $DST_HOST "$VMKFSTOOLS $CLONE_FSTYPE -i $SRC/disk.vmdk $DST/disk.vmdk" \
                  "Error copying $SRC/disk.vmdk to $DST/disk.vmdk"
 else