mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-20 20:02:38 +09:00
Merge branch 'feature-1020' of git.opennebula.org:one into feature-1020
Conflicts: src/tm_mad/vmware/tm_mv.sh
This commit is contained in:
commit
ec75dcb515
3 files changed
+5
-5
No files matched your search
@@ -1,4 +1,4 @@
|
||||
#!/bin/bash
|
||||
#!/bin/bash -xv
|
||||
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
Reference in new issue
Block a user