From 7bd78b6ef51c9aa70648d7cdc43e79227ca3bc05 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 23 Mar 2012 20:30:38 +0100
Subject: [PATCH] fix minor bug in tm_shared/mvds. readlink wasn't being
 evaluated properly

---
 src/tm_mad/shared/mvds | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/tm_mad/shared/mvds b/src/tm_mad/shared/mvds
index 6e3744f98d..b44d724c41 100755
--- a/src/tm_mad/shared/mvds
+++ b/src/tm_mad/shared/mvds
@@ -49,19 +49,15 @@ SRC_HOST=`arg_host $SRC`
 # Move the image back to the datastore
 #-------------------------------------------------------------------------------
 MVSCRIPT=$(cat <<EOF
-SRC_READLN=eval "$READLINK -f $SRC_PATH"
-DST_READLN=eval "$READLINK -f $DST_PATH"
+umask 0007
+SRC_READLN=\$($READLINK -f $SRC_PATH)
+DST_READLN=\$($READLINK -f $DST_PATH)
 
-if [ \( -L $SRC \) -a \( "$SRC_READLN" = "$DST_READLN" \) ] ; then
-	echo "Not moving files to image repo, they are the same"
+if [ \( -L $SRC \) -a \( "\$SRC_READLN" = "\$DST_READLN" \) ] ; then
+    echo "Not moving files to image repo, they are the same"
 else
-	mv -f $SRC_PATH $DST_PATH
-fi
-
-if [ -d $DST_PATH ]; then
-    chmod 0770 $DST_PATH
-else
-    chmod 0660 $DST_PATH
+    qemu-img convert $SRC_PATH -O qcow2 $DST_PATH
+    rm $SRC_PATH
 fi
 EOF
 )