projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Log changes made by flow normalization.
[openvswitch]
/
xenserver
/
usr_sbin_brctl
diff --git
a/xenserver/usr_sbin_brctl
b/xenserver/usr_sbin_brctl
index 2035a4f622302042e5946e238a70069955c8ebc4..7fecc56480390c14219d9aaba28ee4db94a249b7 100755
(executable)
--- a/
xenserver/usr_sbin_brctl
+++ b/
xenserver/usr_sbin_brctl
@@
-1,6
+1,6
@@
#! /usr/bin/python
#
#! /usr/bin/python
#
-# Copyright (c) 2009 Nicira Networks.
+# Copyright (c) 2009
, 2010
Nicira Networks.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-99,6
+99,15
@@
def cmd_show():
print "\t\t\t\t\t\t\t%s" % port
def main():
print "\t\t\t\t\t\t\t%s" % port
def main():
+ # Check the network configuration mode.
+ try:
+ network_mode = read_first_line_of_file('/etc/xensource/network.conf')
+ if network_mode == 'bridge':
+ delegate()
+ except:
+ # File probably doesn't exist
+ pass
+
# Parse the command line.
try:
options, args = getopt.gnu_getopt(sys.argv[1:],
# Parse the command line.
try:
options, args = getopt.gnu_getopt(sys.argv[1:],