From: Gurucharan Shetty <gshetty@nicira.com>
Date: Tue, 12 Feb 2013 17:29:55 +0000 (-0800)
Subject: ovs-ctl.in: Don't execute the restore ofport script in some cases.
X-Git-Tag: v1.11.0~394
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=141642d17f8029bfdf1e76c63cebbd5232452ad1;p=cascardo%2Fovs.git

ovs-ctl.in: Don't execute the restore ofport script in some cases.

While upgrading from openvswitch1.10, we need not restore ofports
across force-reload-kmod.

This patch fixes a bug wherein 'force-reload-kmod' command
tried to execute an empty script that did not have '+x' in
file permissions.

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

diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
index 8288e1336..e186e710c 100755
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -287,6 +287,7 @@ save_ofports_if_required () {
                 "${script_ofports}" script_ofports
             ;;
         *)
+            script_ofports=""
             ;;
     esac
 }