From: Justin Pettit <jpettit@nicira.com>
Date: Tue, 8 Jun 2010 06:17:26 +0000 (-0700)
Subject: xenserver: Don't start OVS if network.conf isn't "openvswitch"
X-Git-Tag: v1.1.0pre1~310
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=697e8aa22f27beb60b524b658e5ee757ef48a0ca;p=sliver-openvswitch.git

xenserver: Don't start OVS if network.conf isn't "openvswitch"

The OVS processes would start as long as "/etc/xensource/network.conf"
didn't contain "bridge".  The other OVS scripts, however, would complain
(and not run) if it wasn't "vswitch" or "openvswitch".  This commit will
only start the OVS processes if a value of "vswitch" or "openvswitch" is
present, so some consistency is provided.

(If "/etc/xensource/network.conf" is not "bridge", "vswitch", or
"openvswitch", then XAPI will refuse to run anyway, so not much is going
to happen on the system.)
---

diff --git a/xenserver/etc_init.d_openvswitch b/xenserver/etc_init.d_openvswitch
index ce7548015..a2c26a0cb 100755
--- a/xenserver/etc_init.d_openvswitch
+++ b/xenserver/etc_init.d_openvswitch
@@ -25,10 +25,14 @@
 test -e /etc/sysconfig/openvswitch && . /etc/sysconfig/openvswitch
 
 NETWORK_MODE=$(cat /etc/xensource/network.conf)
-if test "$NETWORK_MODE" = bridge; then
-    echo "Open vSwitch disabled (/etc/xensource/network.conf is 'bridge')" >&2
-    exit 0
-fi
+case $NETWORK_MODE in
+    vswitch|openvswitch)
+        ;;
+    *)
+        echo "Open vSwitch disabled (/etc/xensource/network.conf is not 'openvswitch')" >&2
+        exit 0
+        ;;
+esac
 
 # General config variables in /etc/sysconfig/openvswitch
 if test "$PRODUCT_VERSION" = "5.5.0"; then