git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-vsctl: Remove default timeout.
[sliver-openvswitch.git]
/
xenserver
/
usr_sbin_brctl
diff --git
a/xenserver/usr_sbin_brctl
b/xenserver/usr_sbin_brctl
index
7fecc56
..
5cf0b88
100755
(executable)
--- a/
xenserver/usr_sbin_brctl
+++ b/
xenserver/usr_sbin_brctl
@@
-35,7
+35,7
@@
def delegate():
def call_vsctl(cmd, arg=""):
database = '--db=' + OVSDB_SERVER
def call_vsctl(cmd, arg=""):
database = '--db=' + OVSDB_SERVER
- command = [VSCTL, database, cmd]
+ command = [VSCTL,
'--timeout=30',
database, cmd]
if (arg):
command.append(arg)
return subprocess.Popen(command, stdout=subprocess.PIPE).communicate()[0].split()
if (arg):
command.append(arg)
return subprocess.Popen(command, stdout=subprocess.PIPE).communicate()[0].split()