From: Keith Amidon <keith@nicira.com>
Date: Wed, 29 Apr 2009 16:50:53 +0000 (-0700)
Subject: Fix copy-paste errors when combining vswitchd & brcompatd init scripts
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=246dec1f001c555ba12406338376020f9ff8cb0f;p=openvswitch

Fix copy-paste errors when combining vswitchd & brcompatd init scripts

There were a couple of places where copied functionality from one
script was properly updated to work in the combined script.
---

diff --git a/vswitchd/etc/init.d/vswitch b/vswitchd/etc/init.d/vswitch
index b9fd59d1..1a08166e 100755
--- a/vswitchd/etc/init.d/vswitch
+++ b/vswitchd/etc/init.d/vswitch
@@ -73,7 +73,7 @@ function ifdown_dp_intf {
     for dp in $(dp_list); do
         local intf=$(dp_intf $dp)
         if [ -e "/etc/sysconfig/network-scripts/ifcfg-$intf" ]; then
-            action "Bringing up datapath interface: $intf" ifdown "$intf"
+            action "Bringing down datapath interface: $intf" ifdown "$intf"
         fi
     done
 }
@@ -137,7 +137,7 @@ function remove_modules {
     if ! lsmod | grep -q "openflow_mod"; then
         action "Removing openflow module" rmmod openflow_mod.ko
     fi
-    if ! lsmod | grep -q "openflow_mod"; then
+    if ! lsmod | grep -q "brcompat_mod"; then
         action "Removing brcompat module" rmmod brcompat_mod.ko
     fi
 }