ovs-ctl.in: Don't save flows if the daemons are not running.

When a 'ovs-ctl restart' is executed and the userspace daemons
like ovsdb-server and ovs-vswitchd are not running, attempt to
save flows can wait forever. This also results in the daemons
from not getting started.

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

diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
index 9ce4973d1d09e130996b0948669b52bfebe0b5db..e8b72bad76138fcca75020d99fce75ddcd1e1fad 100755 (executable)
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -405,10 +405,12 @@ force_reload_kmod () {
 ## ------- ##
 
 restart () {
-    script_flows=`mktemp`
-    trap 'rm -f "${script_flows}"' 0 1 2 13 15
+    if daemon_is_running ovsdb-server && daemon_is_running ovs-vswitchd; then
+        script_flows=`mktemp`
+        trap 'rm -f "${script_flows}"' 0 1 2 13 15
 
-    action "Saving flows" save_flows
+        action "Saving flows" save_flows
+    fi
 
     # Restart the database first, since a large database may take a
     # while to load, and we want to minimize forwarding disruption.