From 4f9a86bf235c9e55f82f82efee832b069634063e Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Thu, 13 Oct 2016 11:16:26 +0200
Subject: [PATCH] Shared and qcow2 drivers removes targets disks before
 creating new disks

---
 src/tm_mad/qcow2/clone  | 13 +++++++++++--
 src/tm_mad/qcow2/ln     |  5 ++++-
 src/tm_mad/shared/clone |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/tm_mad/qcow2/clone b/src/tm_mad/qcow2/clone
index 20efaf1a31..b020ee32ab 100755
--- a/src/tm_mad/qcow2/clone
+++ b/src/tm_mad/qcow2/clone
@@ -104,12 +104,21 @@ else
 
     CLONE_CMD=$(cat <<EOF
 cd $DST_DIR
-rm -rf $DST_PATH{,.snap}
-mkdir -p ${DST_PATH}.snap
+
+rm -rf "${DST_PATH}.snap"
+
+mkdir -p "${DST_PATH}.snap"
+
 $QEMU_IMG create -b $SRC_PATH -f qcow2 $QCOW2_OPTIONS ${DST_PATH}.snap/0
+
+rm -f "${DST_PATH}"
+
 ln -s ${DST_FILE}.snap/0 ${DST_PATH}
+
 cd ${DST_PATH}.snap
+
 ln -s . ${DST_PATH}.snap/${DST_FILE}.snap
+
 ${RESIZE_CMD}
 EOF
 )
diff --git a/src/tm_mad/qcow2/ln b/src/tm_mad/qcow2/ln
index 9aa8da5ef5..799d1c0ad7 100755
--- a/src/tm_mad/qcow2/ln
+++ b/src/tm_mad/qcow2/ln
@@ -109,9 +109,12 @@ if [ -z "\${SNAP}" ]; then
     ln -sf "$SRC_PATH" "$SNAP_DIR/0"
 fi
 
+rm -f "${DST_PATH}"
+
 ln -sf "$SNAP_DIR/\$SNAP" "$DST_PATH"
 
-$RM -rf "${DST_PATH}.snap"
+rm -rf "${DST_PATH}.snap"
+
 ln -sf "$SNAP_DIR" "${DST_PATH}.snap"
 EOT
 )
diff --git a/src/tm_mad/shared/clone b/src/tm_mad/shared/clone
index d410aff0d3..bf6c958135 100755
--- a/src/tm_mad/shared/clone
+++ b/src/tm_mad/shared/clone
@@ -98,6 +98,7 @@ fi
 log "Cloning $SRC_PATH in $DST"
 
 CLONE_CMD="cd ${DST_DIR}; \
+    rm -f ${DST_PATH}; \
     cp ${SRC_PATH} ${DST_PATH} \
     ${RESIZE_CMD}"