From: Gurucharan Shetty <gshetty@nicira.com>
Date: Mon, 18 Mar 2013 19:33:17 +0000 (-0700)
Subject: debian: Re-add --timeout option for ifupdown script.
X-Git-Tag: sliver-openvswitch-1.10.90-1~10^2~50
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=0daa9cf2e1ccf09024080e0ae2a393bf620168ea

debian: Re-add --timeout option for ifupdown script.

Commit fba6bd1d3f(ovs-vsctl: Try connecting only once for active connections..)
removed the timeout option from ifupdown.sh. Removing the "--timeout=" option
can cause ifupdown script to hang if ovs-vswitchd is not running and ifupdown
script changes the OVSDB. So, re-add it.

Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
---

diff --git a/debian/ifupdown.sh b/debian/ifupdown.sh
index f728f7c77..e45653360 100755
--- a/debian/ifupdown.sh
+++ b/debian/ifupdown.sh
@@ -22,7 +22,7 @@ if [ -z "${IF_OVS_TYPE}" ]; then
 fi
 
 ovs_vsctl() {
-    ovs-vsctl "$@"
+    ovs-vsctl --timeout=5 "$@"
 }
 
 if (ovs_vsctl --version) > /dev/null 2>&1; then :; else