From ab4e9f456f4fc63604b3731c0b3eff89a8839c8b Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 24 Jul 2012 18:27:35 +0200 Subject: [PATCH 1/2] Fix onevm help typos --- src/cli/onevm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cli/onevm b/src/cli/onevm index 7adf8592c5..082bc6ac97 100755 --- a/src/cli/onevm +++ b/src/cli/onevm @@ -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 From 1bb25b8461119f63eb3ea8226137e791c6fb8b3c Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Thu, 26 Jul 2012 12:37:22 +0200 Subject: [PATCH 2/2] bug #1395: bugs in tm lvm drivers --- src/tm_mad/lvm/clone | 2 +- src/tm_mad/lvm/delete | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tm_mad/lvm/clone b/src/tm_mad/lvm/clone index a4a7ab9e92..492102bebb 100755 --- a/src/tm_mad/lvm/clone +++ b/src/tm_mad/lvm/clone @@ -24,7 +24,7 @@ SRC=$1 DST=$2 -VM_ID=$3 +VM_ID=$(basename `dirname $DST`) DS_ID=$4 if [ -z "${ONE_LOCATION}" ]; then diff --git a/src/tm_mad/lvm/delete b/src/tm_mad/lvm/delete index 4f8b805aaa..43b05fc4e2 100755 --- a/src/tm_mad/lvm/delete +++ b/src/tm_mad/lvm/delete @@ -43,8 +43,8 @@ DST_HOST=`arg_host $DST` DELETE_CMD=$(cat <