From 5e521b3dc7137ed562d3f93f955b330ddf38ea55 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Thu, 8 Nov 2012 23:49:56 +0100
Subject: [PATCH] bug #1635: Remove disks in detach operations

---
 src/tm_mad/vmfs/delete | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/tm_mad/vmfs/delete b/src/tm_mad/vmfs/delete
index 9c289c582d..cb6e6b59f5 100755
--- a/src/tm_mad/vmfs/delete
+++ b/src/tm_mad/vmfs/delete
@@ -60,27 +60,32 @@ vmfs_set_up
 # remote_system_ds directory for the VM (remotely)
 #-------------------------------------------------------------------------------
 
-if [ `is_disk $DST_PATH` -eq 1 ]; then
-	exit 0
-fi
-
 log "Deleting $DST_PATH"
 
 if [ "$USE_SSH" == "yes" ]; then
-	ssh_exec_and_log $DST_HOST "rm -rf $DST_PATH" "Error deleting $DST_PATH"
+    ssh_exec_and_log $DST_HOST "rm -rf $DST_PATH" "Error deleting $DST_PATH"
 else
-	DIRS_TO_ERASE=`vifs $VI_PARAMS --dir [$DSID]$VMID|grep -v "Content Listing"|grep -v "\-\-\-\-\-\-\-\-"|egrep -v "^[[:space:]]*$"`
-	for dir in $DIRS_TO_ERASE; do
-		FILES_TO_ERASE=`vifs $VI_PARAMS --dir [$DSID]$VMID/$dir|grep -v "Content Listing"|grep -v "\-\-\-\-\-\-\-\-"|egrep -v "^[[:space:]]*$"`
-		for file in $FILES_TO_ERASE; do
-			exec_and_log "vifs $VI_PARAMS --force --rm [$DSID]$VMID/$dir/$file" \
-	                     "Cannot delete [$DSID]$VMID/$dir/$file in $DST_HOST"
-	    done
-    	exec_and_log "vifs $VI_PARAMS --force --rm [$DSID]$VMID/$dir" \
-         "Cannot delete [$DSID]$VMID in $DST_HOST"
-	done
-	exec_and_log "vifs $VI_PARAMS --force --rm [$DSID]$VMID" \
+    if [ `is_disk $DST_PATH` -eq 1 ]; then
+            dir=$(basename $DST_PATH)
+            FILES_TO_ERASE=`vifs $VI_PARAMS --dir [$DSID]$VMID/$dir|grep -v "Content Listing"|grep -Fv "--------"|egrep -v "^[[:space:]]*$"`
+            for file in $FILES_TO_ERASE; do
+                exec_and_log "vifs $VI_PARAMS --force --rm [$DSID]$VMID/$dir/$file" \
+                             "Cannot delete [$DSID]$VMID/$dir/$file in $DST_HOST"
+            done
+            exec_and_log "vifs $VI_PARAMS --force --rm [$DSID]$VMID/$dir" \
              "Cannot delete [$DSID]$VMID in $DST_HOST"
+    else
+        DIRS_TO_ERASE=`vifs $VI_PARAMS --dir [$DSID]$VMID|grep -v "Content Listing"|grep -Fv "--------"|egrep -v "^[[:space:]]*$"`
+        for dir in $DIRS_TO_ERASE; do
+            FILES_TO_ERASE=`vifs $VI_PARAMS --dir [$DSID]$VMID/$dir|grep -v "Content Listing"|grep -Fv "--------"|egrep -v "^[[:space:]]*$"`
+            for file in $FILES_TO_ERASE; do
+                exec_and_log "vifs $VI_PARAMS --force --rm [$DSID]$VMID/$dir/$file" \
+                             "Cannot delete [$DSID]$VMID/$dir/$file in $DST_HOST"
+            done
+            exec_and_log "vifs $VI_PARAMS --force --rm [$DSID]$VMID/$dir" \
+             "Cannot delete [$DSID]$VMID in $DST_HOST"
+        done
+    fi
 fi
 
 exit 0