You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2013/05/22 20:21:46 UTC
git commit: updated refs/heads/4.1 to c342fa6
Updated Branches:
refs/heads/4.1 6ddd876e5 -> c342fa69a
CLOUDSTACK-105,
there is a trailing '\n' after 'bridge', need to remove it before checking if XS is in bridge mode or ovs mode
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c342fa69
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c342fa69
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c342fa69
Branch: refs/heads/4.1
Commit: c342fa69a827a00aa3297a6cc9f6a15e7f711cd9
Parents: 6ddd876
Author: Anthony Xu <an...@citrix.com>
Authored: Wed May 22 11:20:26 2013 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Wed May 22 11:20:26 2013 -0700
----------------------------------------------------------------------
scripts/vm/hypervisor/xenserver/vmops | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c342fa69/scripts/vm/hypervisor/xenserver/vmops
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops
index 21c73ac..4075d1c 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -267,7 +267,7 @@ def setLinkLocalIP(session, args):
except:
return 'can not cat network.conf'
- if result.lower() == "bridge":
+ if result.lower().strip() == "bridge":
try:
cmd = ["brctl", "addbr", brName]
txt = util.pread2(cmd)