diff --git a/src/datastore_mad/remotes/vmfs/cp b/src/datastore_mad/remotes/vmfs/cp index 76f0ab6373..0fe6a93ed3 100755 --- a/src/datastore_mad/remotes/vmfs/cp +++ b/src/datastore_mad/remotes/vmfs/cp @@ -142,7 +142,7 @@ fi # Make the final hop, front-end -> VMFS Datastore if [ "$USE_SSH" == "yes" ]; then - exec_and_log "$SCP -r $SRC $DST" "Error copying $SRC to $DST through SCP" + exec_and_log "$SCP -r $SRC $DST_HOST:$DST" "Error copying $SRC to $DST through SCP" else cd $SRC for file in $(find . -type f); do diff --git a/src/datastore_mad/remotes/vmfs/mkfs b/src/datastore_mad/remotes/vmfs/mkfs index 8232a8337e..3fac6f92a7 100755 --- a/src/datastore_mad/remotes/vmfs/mkfs +++ b/src/datastore_mad/remotes/vmfs/mkfs @@ -94,8 +94,8 @@ VMWARE_DISK_TYPE=`echo $FSTYPE|cut -d'_' -f 2` if [ "$USE_SSH" == "yes" ]; then ssh_exec_and_log $DST_HOST "mkdir -p /vmfs/volumes/$IMAGE_DS_ID/$DST_FOLDER" \ "Could not create disk directory /vmfs/volumes/$IMAGE_DS_ID/$DST_FOLDER on $DST_HOST" - ssh_exec_and_log $DST_HOST "$VMKFSTOOLS -U [$IMAGE_DS_ID]$DST_FOLDER/disk.vmdk" - ssh_exec_and_log $DST_HOST "$VMKFSTOOLS -c ${SIZE}M -d ${VMWARE_DISK_TYPE} [$IMAGE_DS_ID]$DST_FOLDER/disk.vmdk" \ + $SSH $DST_HOST $VMKFSTOOLS -U [$IMAGE_DS_ID]$DST_FOLDER/disk.vmdk + ssh_exec_and_log $DST_HOST "$VMKFSTOOLS -c ${SIZE}M -d ${VMWARE_DISK_TYPE} /vmfs/volumes/$IMAGE_DS_ID/$DST_FOLDER/disk.vmdk" \ "Cannot create [$IMAGE_DS_ID] $DST_FOLDER/disk.vmdk on $DST_HOST" else $VMKFSTOOLS $VI_PARAMS -U [$IMAGE_DS_ID]$DST_FOLDER/disk.vmdk &> /dev/null diff --git a/src/tm_mad/vmware/clone b/src/tm_mad/vmware/clone index 1bc1df13c3..c6ae106584 100755 --- a/src/tm_mad/vmware/clone +++ b/src/tm_mad/vmware/clone @@ -46,7 +46,6 @@ source $(dirname $0)/tm_vmwarerc # Set dst path and dir #------------------------------------------------------------------------------- SRC_PATH=`arg_path $SRC` -SRC_PATH="../../${SRC_PATH##"$DS_DIR/"}" SRC_FOLDER=`basename $SRC_PATH` DST_PATH=`arg_path $DST`