From: Justin Pettit <jpettit@nicira.com>
Date: Tue, 16 Jun 2009 19:57:25 +0000 (-0700)
Subject: xenserver: Force reload of config file after VIF deleted
X-Git-Tag: v0.90.2~1^2~12
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f304568eaa5a160ebc2031b84abc3337771612b2;p=sliver-openvswitch.git

xenserver: Force reload of config file after VIF deleted

When a VIF is deleted, the "vif" script modifies "/etc/ovs-vswitchd.conf".
After changes are made to the config file, ovs-vswitchd should be told
to reload it, but this wasn't happening.  Now it does.

Thanks to Natasha for catching this.
---

diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index 35ada1f1e..aebb4ccda 100755
--- a/xenserver/etc_xensource_scripts_vif
+++ b/xenserver/etc_xensource_scripts_vif
@@ -128,9 +128,10 @@ remove)
 	xenstore-rm "${HOTPLUG}/hotplug"
 	vif=vif${DOMID}.${DEVID}
 	logger -t scripts-vif "${vif} has been removed"
-        $cfg_mod -vANY:console:emer -F /etc/ovs-vswitchd.conf \
-            --del-match="bridge.*.port=${vif}" \
+	$cfg_mod -vANY:console:emer -F /etc/ovs-vswitchd.conf \
+	    --del-match="bridge.*.port=${vif}" \
 	    --del-match="vlan.${vif}.[!0-9]*" \
 	    --del-match="port.${vif}.[!0-9]*" -c
+	$service vswitch reload
 	;;
 esac