Merge branch 'master' of git.opennebula.org:one

This commit is contained in:
Tino Vazquez committed 2012-07-26 15:16:05 +02:00
commit 43e405b444
3 files changed
+7 -7

No files matched your search

+4 -4
View File
@@ -156,8 +156,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
saveas_desc = <<-EOT.unindent
Sets the specified VM disk to be saved in a new Image. The Image is
created inmediately, but the contents are saved only if the VM is
shut down gracefuly (i.e., using 'onevm shutdown' and not
created immediately, but the contents are saved only if the VM is
shut down gracefully (i.e., using 'onevm shutdown' and not
'onevm delete')
States: ANY
@@ -279,9 +279,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
end
resubmit_desc = <<-EOT.unindent
Resubmits the VM to PENDING state. This is intented for VMs stuck in a
Resubmits the VM to PENDING state. This is intended for VMs stuck in a
transient state. To re-deploy a fresh copy of the same VM, create a
Template and instantiante it, see 'onetemplate instantiate'
Template and instantiate it, see 'onetemplate instantiate'
States: ANY, except SUSPENDED or DONE
EOT
+1 -1
View File
@@ -24,7 +24,7 @@
SRC=$1
DST=$2
VM_ID=$3
VM_ID=$(basename `dirname $DST`)
DS_ID=$4
if [ -z "${ONE_LOCATION}" ]; then
+2 -2
View File
@@ -43,8 +43,8 @@ DST_HOST=`arg_host $DST`
DELETE_CMD=$(cat <<EOF
DEV=\$(readlink $DST_PATH)
LV=\$(basename \$DEV)
VM=$(echo \$LV|cut -d- -f4)
DISK_ID=$(echo \$LV|cut -d- -f5)
VM=\$(echo \$LV|cut -d- -f4)
DISK_ID=\$(echo \$LV|cut -d- -f5)
if [ -n "\$VM" -a -n "\$DISK_ID" ]; then
$SUDO $LVREMOVE -f \$DEV