shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-24 21:34:01 +03:00
Code Releases Wiki Activity

Merge branch 'feature-1020' of git.opennebula.org:one into feature-1020

Browse Source 
Conflicts:
	src/tm_mad/vmware/tm_mv.sh
This commit is contained in:
Ruben S. Montero 2011-12-24 03:56:14 +01:00
commit ec75dcb515
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tm_mad/vmware/tm_ln.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -xv
# ---------------------------------------------------------------------------- #
# Copyright 2010-2011, C12G Labs S.L #

4
src/tm_mad/vmware/tm_mv.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash
# ---------------------------------------------------------------------------- #
# Copyright 2010-2011, C12G Labs S.L #
@ -48,7 +48,7 @@ elif [ "`is_disk $SRC_PATH`" = "0" ] ; then
log "Moving $SRC_PATH"
   exec_and_log "mv $SRC_PATH $DST_PATH"
elif [ -d $SRC_PATH ]; then
log "Will not move, is not saving a VM disk image"
log "Will not move, it is not saving a VM disk image"
else
log "Moving $SRC_PATH"
exec_and_log "mv $SRC_PATH $DST_PATH"

4
src/vmm_mad/remotes/vmware/deploy
View File

@ -33,8 +33,8 @@ dfile = ARGV[0]
host = ARGV[1]
id = ARGV[2]
vmware_drv = VMwareDriver.new(host, id)
vmware_drv = VMwareDriver.new(host)
puts vmware_drv.deploy(dfile)
puts vmware_drv.deploy(dfile, id)
exit 0