0001-bug-1619-tm-vmfs-delete-and-mvds-now-get-correctly-t.patch
| src/tm_mad/tm_common.sh | ||
|---|---|---|
| 80 | 80 |
echo $dots${src#$common/}
|
| 81 | 81 |
} |
| 82 | 82 | |
| 83 |
# Gets wether the vmfs drivers should use ssh or not |
|
| 83 |
# Gets whether the vmfs drivers should use ssh or not
|
|
| 84 | 84 |
function get_tm_use_ssh {
|
| 85 | 85 |
DATASTORE_ID=$1 |
| 86 | 86 | |
| src/tm_mad/vmfs/delete | ||
|---|---|---|
| 41 | 41 |
. $TMCOMMON |
| 42 | 42 |
source $(dirname $0)/tm_vmfs.conf |
| 43 | 43 | |
| 44 |
DST_PATH=`arg_path $DST` |
|
| 45 |
DST_HOST=`arg_host $DST` |
|
| 46 | ||
| 44 | 47 |
#------------------------------------------------------------------------------- |
| 45 | 48 |
# Retrieve needed information |
| 46 | 49 |
#------------------------------------------------------------------------------- |
| ... | ... | |
| 54 | 57 |
vmfs_set_up |
| 55 | 58 | |
| 56 | 59 |
#------------------------------------------------------------------------------- |
| 57 |
# Return if deleting a disk, we will delete them when removing the
|
|
| 60 |
# Return if deleting a disk, we will delete them when removing the |
|
| 58 | 61 |
# remote_system_ds directory for the VM (remotely) |
| 59 | 62 |
#------------------------------------------------------------------------------- |
| 60 |
DST_PATH=`arg_path $DST` |
|
| 61 |
DST_HOST=`arg_host $DST` |
|
| 62 | 63 | |
| 63 | 64 |
if [ `is_disk $DST_PATH` -eq 1 ]; then |
| 64 | 65 |
exit 0 |
| src/tm_mad/vmfs/mvds | ||
|---|---|---|
| 49 | 49 |
SRC_FOLDER=`basename $SRC_PATH` |
| 50 | 50 | |
| 51 | 51 |
DST_PATH=`arg_path $DST` |
| 52 |
DST_HOST=`arg_host $DST` |
|
| 52 | 53 |
DST_FOLDER=`basename $DST_PATH` |
| 53 | 54 | |
| 54 | 55 |
USE_SSH=$(get_tm_use_ssh $DSID) |
| 55 |
- |
|