Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9FDC210B1B for ; Fri, 12 Jul 2013 11:05:31 +0000 (UTC) Received: (qmail 75750 invoked by uid 500); 12 Jul 2013 11:05:31 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 75732 invoked by uid 500); 12 Jul 2013 11:05:31 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 75723 invoked by uid 99); 12 Jul 2013 11:05:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jul 2013 11:05:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 24490894E59; Fri, 12 Jul 2013 11:05:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aprateek@apache.org To: commits@cloudstack.apache.org Message-Id: <49c7a5982aaf4ff593619a67f37bc411@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 9d857c0 Date: Fri, 12 Jul 2013 11:05:31 +0000 (UTC) Updated Branches: refs/heads/master b3e2871e7 -> 9d857c036 fix xenserver 6.1 and 6.2 can not open vnc console Signed-off-by: Abhinandan Prateek Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9d857c03 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9d857c03 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9d857c03 Branch: refs/heads/master Commit: 9d857c03623ae4851d96c7303d4c3df002104fe1 Parents: b3e2871 Author: hongtu_zang Authored: Fri Jul 12 17:26:47 2013 +0800 Committer: Abhinandan Prateek Committed: Fri Jul 12 16:35:17 2013 +0530 ---------------------------------------------------------------------- scripts/vm/hypervisor/xenserver/vmops | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d857c03/scripts/vm/hypervisor/xenserver/vmops ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index 650e955..f8c0253 100755 --- a/scripts/vm/hypervisor/xenserver/vmops +++ b/scripts/vm/hypervisor/xenserver/vmops @@ -82,7 +82,7 @@ def getvncport(session, args): path1 = "/local/domain/" + domid + "/qemu-pid" path2 = "/local/domain/" + domid + "/console/vnc-port" else: - if version[:3] == '6.0': + if version[:3] == '6.0' or version[:3] == '6.1' or version[:3] == '6.2': path1 = "/local/domain/" + domid + "/vncterm-pid" path2 = "/local/domain/" + domid + "/console/vnc-port" else: