From 8f762b5d2a0ed99ff0d6651ab07aec7866415c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tino=20V=C3=A1zquez?= <tinova@fdi.ucm.es>
Date: Thu, 30 Sep 2010 19:32:04 +0200
Subject: [PATCH] Changes for clone nfs

Add support for new vmware storage requirements (2 disks and .vmdk)
---
 src/tm_mad/nfs/tm_clone.sh | 2 +-
 src/vmm/LibVirtDriver.cc   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tm_mad/nfs/tm_clone.sh b/src/tm_mad/nfs/tm_clone.sh
index 2bba596e24..f1a904ab6c 100755
--- a/src/tm_mad/nfs/tm_clone.sh
+++ b/src/tm_mad/nfs/tm_clone.sh
@@ -51,7 +51,7 @@ http://*)
 
 *)
     log "Cloning $SRC_PATH"
-    exec_and_log "cp $SRC_PATH $DST_PATH"
+    exec_and_log "cp -r $SRC_PATH $DST_PATH"
     ;;
 esac
 
diff --git a/src/vmm/LibVirtDriver.cc b/src/vmm/LibVirtDriver.cc
index e02e455c9d..516fec36aa 100644
--- a/src/vmm/LibVirtDriver.cc
+++ b/src/vmm/LibVirtDriver.cc
@@ -805,7 +805,7 @@ int LibVirtDriver::deployment_description_vmware(
         {
             file << "\t\t<disk type='file' device='disk'>" << endl
                  << "\t\t\t<source file='[" <<  datastore <<"] " << vm->get_oid() 
-                 << "/images/disk." << i << ".vmdk'/>" << endl;
+                 << "/images/disk." << i << "/disk.vmdk'/>" << endl;
         }
 
         file << "\t\t\t<target dev='" << target << "'";