feature #1020: Fix bugs when dealing with persistent imageswq

src/image_mad/remotes/fs/mv

@@ -53,7 +53,9 @@ http://*)
 
 *)
     log "Moving local image $SRC to the image repository"
-    if [ \( -L $SRC \) -a \( "`$READLINK $SRC`" = "$DST" \) ] ; then
+ 
+    if [ \( -L $SRC \) -a \
+         \( "`$READLINK -f $SRC`" = "`$READLINK -f $DST`" \) ] ; then
        log "Not moving files to image repo, they are the same"
     else
        exec_and_log "mv -f $SRC $DST" "Could not move $SRC to $DST"

src/tm_mad/vmware/tm_ln.sh

@@ -51,4 +51,4 @@ for file in `find $SRC_PATH -type f`; do
 done
 
 #Mark this disk persistent with a symlink for tm_mv and repo mv
-exec_and_log "ln -sf $REL_SRC_PATH $DST_PATH/.disk"
+exec_and_log "ln -sf ${REL_SRC_PATH#../../} $DST_PATH/.disk"