CLOUDSTACK-2115: remove the trailing '\n' to get correct XS network mode
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1518e7ee Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1518e7ee Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1518e7ee Branch: refs/heads/ui-vpc-redesign Commit: 1518e7ee43f091fc528cb7b70e5dcfdf7c623e22 Parents: 26cefdc Author: Anthony Xu <[email protected]> Authored: Tue May 14 17:52:10 2013 -0700 Committer: Anthony Xu <[email protected]> Committed: Tue May 14 17:52:10 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/1518e7ee/scripts/vm/hypervisor/xenserver/vmops ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index 66cde4f..60fb8ab 100755 --- a/scripts/vm/hypervisor/xenserver/vmops +++ b/scripts/vm/hypervisor/xenserver/vmops @@ -279,7 +279,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)
