From: Gurucharan Shetty <gshetty@nicira.com>
Date: Mon, 29 Oct 2012 19:25:09 +0000 (-0700)
Subject: ovs-ctl.in: Do not fail 'restart'.
X-Git-Tag: sliver-openvswitch-1.9.90-3~10^2~261
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3f99442dc413ebcffcfeb36bfeabd74c58392dd1;p=sliver-openvswitch.git

ovs-ctl.in: Do not fail 'restart'.

ovs-ctl restart is called by the debian package upgrade.
We do not want to fail the package upgrade just because
restoring of flows failed.

The error message will still be printed on the console.

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

diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
index e8b72bad7..7febd1c21 100755
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -420,7 +420,8 @@ restart () {
     stop_forwarding
     start_forwarding
 
-    restore_flows
+    # Restore the saved flows. Do not return error if restore fails.
+    restore_flows || true
 }
 
 ## --------------- ##