From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23676 invoked by alias); 24 Sep 2008 06:54:40 -0000 Received: (qmail 23670 invoked by alias); 24 Sep 2008 06:54:40 -0000 X-Spam-Status: No, hits=-1.1 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com X-Spam-Level: Subject: STABLE2 - [rgmanager] Fix live migration option (broken in last commit) To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE2 X-Git-Reftype: branch X-Git-Oldrev: 70928ae17cfc67e76421357000ace3f0f55a5119 X-Git-Newrev: c0d298321776c1d468eef2658c258a699853a054 From: "Fabio M. Di Nitto" Message-Id: <20080924065334.6A05F120420@lists.fedorahosted.org> Date: Wed, 24 Sep 2008 07:17:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00500.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c0d298321776c1d468eef2658c258a699853a054 Commit: c0d298321776c1d468eef2658c258a699853a054 Parent: 70928ae17cfc67e76421357000ace3f0f55a5119 Author: Lon Hohberger AuthorDate: Tue May 20 09:49:31 2008 -0400 Committer: Fabio M. Di Nitto CommitterDate: Wed Sep 24 08:53:26 2008 +0200 [rgmanager] Fix live migration option (broken in last commit) --- rgmanager/src/resources/vm.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/resources/vm.sh b/rgmanager/src/resources/vm.sh index e423889..15e1f2a 100644 --- a/rgmanager/src/resources/vm.sh +++ b/rgmanager/src/resources/vm.sh @@ -477,7 +477,7 @@ migrate() target=${OCF_RESKEY_migration_mapping#*$target:} target=${target%%,*} fi - err=$(xm migrate $OCF_RESKEY_name $target 2>&1 | head -1; exit ${PIPESTATUS[0]}) + err=$(xm migrate $migrate_opt $OCF_RESKEY_name $target 2>&1 | head -1; exit ${PIPESTATUS[0]}) rv=$? if [ $rv -ne 0 ]; then