projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fatal-signal: After fork, clear hooks instead of disabling them.
[openvswitch]
/
xenserver
/
opt_xensource_libexec_interface-reconfigure
diff --git
a/xenserver/opt_xensource_libexec_interface-reconfigure
b/xenserver/opt_xensource_libexec_interface-reconfigure
index 3021df1db6212b2724ad8ea61d47b0274f8da828..f28ae74cced1afd133f800e5944cedd90cc95d8d 100755
(executable)
--- a/
xenserver/opt_xensource_libexec_interface-reconfigure
+++ b/
xenserver/opt_xensource_libexec_interface-reconfigure
@@
-1214,7
+1214,7
@@
def datapath_configure_bond(pif,slaves):
pifrec = db.get_pif_record(pif)
interface = pif_netdev_name(pif)
pifrec = db.get_pif_record(pif)
interface = pif_netdev_name(pif)
- argv = ['--', 'add-bond', bridge, interface]
+ argv = ['--', '
--fake-iface', '
add-bond', bridge, interface]
for slave in slaves:
argv += [pif_netdev_name(slave)]
for slave in slaves:
argv += [pif_netdev_name(slave)]
@@
-1255,7
+1255,7
@@
def datapath_modify_config(commands):
for c in commands:
log(" %s" % c)
for c in commands:
log(" %s" % c)
- rc = run_command(['/usr/bin/ovs-vsctl']
+ rc = run_command(['/usr/bin/ovs-vsctl']
+ ['--timeout=20']
+ [c for c in commands if not c.startswith('#')])
if not rc:
raise Error("Failed to modify vswitch configuration")
+ [c for c in commands if not c.startswith('#')])
if not rc:
raise Error("Failed to modify vswitch configuration")