shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Bug #1794: Make vmfs/cp and vmware/cp more robust

Browse Source 
(cherry picked from commit 3193a4b8df2504606f4b3b1116edf5323e359171)

Conflicts:
	src/datastore_mad/remotes/vmware/cp
This commit is contained in:
Jaime Melis 2013-03-06 14:50:43 +01:00
parent c560d389f0
commit 4a591c2fb0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/datastore_mad/remotes/vmfs/cp
View File

@ -133,7 +133,7 @@ esac
# Rename the disk filename to disk.vmdk (warning: it does so in SRC)
if [ ! -f $SRC/disk.vmdk ]; then
BASE_DISK_FILE=`ls $SRC | grep -v '\-\(flat\|delta\|s[0-9]*\)\.vmdk$'`
BASE_DISK_FILE=`ls $SRC | grep '\.vmdk$' | grep -v '\-\(flat\|delta\|s[0-9]*\)\.vmdk$'`
exec_and_log "mv -f $SRC/$BASE_DISK_FILE $SRC/disk.vmdk" \
"Error renaming disk file $SRC/$BASE_DISK_FILE to $SRC/disk.vmdk"

2
src/datastore_mad/remotes/vmware/cp
View File

@ -103,7 +103,7 @@ http://*|https://* )
esac
if [ -d "$DST" -a ! -f "$DST/disk.vmdk" ]; then
BASE_DISK_FILE=`ls $DST | grep -v '\-\(flat\|delta\|s[0-9]*\)\.vmdk$'`
BASE_DISK_FILE=`ls $SRC | grep '\.vmdk$' | grep -v '\-\(flat\|delta\|s[0-9]*\)\.vmdk$'`
exec_and_log "mv -f $DST/$BASE_DISK_FILE $DST/disk.vmdk" \