debian: Re-add --timeout option for ifupdown script.
authorGurucharan Shetty <gshetty@nicira.com>
Mon, 18 Mar 2013 19:33:17 +0000 (12:33 -0700)
committerGurucharan Shetty <gshetty@nicira.com>
Mon, 18 Mar 2013 20:26:35 +0000 (13:26 -0700)
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>
debian/ifupdown.sh

index f728f7c..e456533 100755 (executable)
@@ -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