Bug #3097: remove target symlink before creating it in the LN and CLONE actions

src/tm_mad/dev/ln

@@ -55,7 +55,7 @@ ssh_make_path $DST_HOST $DST_DIR
 log "Linking $SRC_PATH in $DST"
 
 ssh_exec_and_log $DST_HOST \
-                "cd $DST_DIR; rm $DST_PATH ; ln -s $SRC_PATH $DST_PATH" \
+                "cd $DST_DIR; rm -f $DST_PATH ; ln -s $SRC_PATH $DST_PATH" \
                 "Error linking $SRC to $DST"
 
 exit 0

src/tm_mad/fs_lvm/clone

@@ -78,6 +78,7 @@ CLONE_CMD=$(cat <<EOF
 
     $SUDO $LVCREATE -L${SIZE}B -n $LV_NAME $VG_NAME
     $SUDO $DD if="$SRC_PATH" of="$DEV" bs=64k
+    rm -f "$DST_PATH"
     ln -s "$DEV" "$DST_PATH"
 EOF
 )

src/tm_mad/lvm/clone

@@ -74,6 +74,7 @@ CLONE_CMD=$(cat <<EOF
             | tr -d ' ')
     $SUDO $LVCREATE -L\${SIZE}M -n $LV_CLONE $VG_NAME
     $SUDO $DD if=$TARGET_DEV of=$LV_CLONE_DEV bs=64k
+    rm -f "$DST_PATH"
     ln -s "$LV_CLONE_DEV" "$DST_PATH"
 EOF
 )

src/tm_mad/lvm/ln

@@ -52,7 +52,8 @@ TARGET_DEV="/dev/$VG_NAME/$LV_NAME"
 LINK_CMD=$(cat <<EOF
     set -e
     mkdir -p $DST_DIR
-    ln -sf "$TARGET_DEV" "$DST_PATH"
+    rm -f "$DST_PATH"
+    ln -s "$TARGET_DEV" "$DST_PATH"
 EOF
 )
 

src/tm_mad/qcow2/clone

@@ -68,7 +68,7 @@ http://*)
 *)
     log "Cloning $SRC_PATH in $DST"
 
-    CLONE_CMD="cd $DST_DIR; $QEMU_IMG create -b $SRC_PATH -f qcow2 $DST_PATH"
+    CLONE_CMD="cd $DST_DIR; rm -f $DST_PATH; $QEMU_IMG create -b $SRC_PATH -f qcow2 $DST_PATH"
     ssh_exec_and_log "$DST_HOST" "$CLONE_CMD" "Error copying $SRC to $DST"
     ;;
 esac

src/tm_mad/shared/ln

@@ -64,7 +64,7 @@ ssh_make_path $DST_HOST $DST_DIR
 log "Linking $SRC_PATH in $DST"
 
 ssh_exec_and_log $DST_HOST \
-                "cd $DST_DIR; rm $DST_PATH ; ln -s $SRC_PATH $DST_PATH" \
+                "cd $DST_DIR; rm -f $DST_PATH ; ln -s $SRC_PATH $DST_PATH" \
                 "Error linking $SRC to $DST"
 
 exit 0

src/tm_mad/vmfs/clone

@@ -87,6 +87,8 @@ else
   rm -f $DST_PATH
 
   cp $SRC_PATH $DST_PATH
+
+  rm -f $DST_PATH.iso
   ln -s $DST_PATH $DST_PATH.iso
 fi
 EOF

src/tm_mad/vmfs/ln

@@ -84,6 +84,7 @@ if [ ! -d $DST_DIR ]; then
    mkdir -p $DST_DIR
 fi
 
+rm -f $DST_PATH.iso
 ln -s $SRC_PATH $DST_PATH.iso
 EOF
 )