From 6ce0a5b07986440b19b0bfd745f2ec1c25a38360 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Wed, 7 Nov 2012 15:42:34 -0500
Subject: [PATCH] Bug #1635: fix for common, iscsi and lvm

---
 src/tm_mad/common/delete | 6 +-----
 src/tm_mad/iscsi/delete  | 3 +++
 src/tm_mad/lvm/delete    | 3 +++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/tm_mad/common/delete b/src/tm_mad/common/delete
index 9ae6e42f29..e2dd4bb636 100755
--- a/src/tm_mad/common/delete
+++ b/src/tm_mad/common/delete
@@ -36,16 +36,12 @@ fi
 . $TMCOMMON
 
 #-------------------------------------------------------------------------------
-# Return if deleting a disk, we will delete them when removing the 
+# Return if deleting a disk, we will delete them when removing the
 # remote_system_ds directory for the VM (remotely)
 #-------------------------------------------------------------------------------
 DST_PATH=`arg_path $DST`
 DST_HOST=`arg_host $DST`
 
-if [ `is_disk $DST_PATH` -eq 1 ]; then
-	exit 0
-fi
-
 log "Deleting $DST_PATH"
 ssh_exec_and_log $DST_HOST "rm -rf $DST_PATH" "Error deleting $DST_PATH"
 
diff --git a/src/tm_mad/iscsi/delete b/src/tm_mad/iscsi/delete
index 0f068deb11..4964af081e 100755
--- a/src/tm_mad/iscsi/delete
+++ b/src/tm_mad/iscsi/delete
@@ -124,6 +124,9 @@ DELETE_CMD=$(cat <<EOF
 
     # remove lv
     $SUDO $LVREMOVE -f $VG_NAME/$TARGET_LV_NAME
+
+    # remove link
+    rm -f $DST_PATH
 EOF
 )
 
diff --git a/src/tm_mad/lvm/delete b/src/tm_mad/lvm/delete
index 23f4528c63..9071bd9353 100755
--- a/src/tm_mad/lvm/delete
+++ b/src/tm_mad/lvm/delete
@@ -43,6 +43,9 @@ DST_HOST=`arg_host $DST`
 DELETE_CMD=$(cat <<EOF
     DEV=\$(readlink $DST_PATH)
     $SUDO $LVREMOVE -f \$DEV
+
+    # remove link
+    rm -f $DST_PATH
 EOF
 )