From 6cdc30df70fe1ecac5b29463d64408af156ec691 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 11 May 2012 17:51:55 +0200
Subject: [PATCH] Bug #1204: VMware datastore should handle falt vmdks

---
 src/datastore_mad/remotes/vmware/cp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/datastore_mad/remotes/vmware/cp b/src/datastore_mad/remotes/vmware/cp
index bb4995a5ef..a0e892d153 100755
--- a/src/datastore_mad/remotes/vmware/cp
+++ b/src/datastore_mad/remotes/vmware/cp
@@ -76,8 +76,10 @@ case $SRC in
 
     exec_and_log "cp -rf $SRC $DST" "Error copying $SRC to $DST"
 
+
     if [ ! -f $DST/disk.vmdk ]; then
-        BASE_DISK_FILE=`ls $DST | grep -v '.*-s[0-9]*\.vmdk'`
+        BASE_DISK_FILE=`ls $DST | grep -v '\-\(flat\|delta\|s[0-9]*\)\.vmdk$'`
+
 
         exec_and_log "mv -f $DST/$BASE_DISK_FILE $DST/disk.vmdk" \
             "Error renaming disk file $BASE_DISK_FILE to disk.vmdk"