From: Justin Pettit <jpettit@nicira.com>
Date: Tue, 8 Jun 2010 19:53:46 +0000 (-0700)
Subject: xenserver: Don't complain for "bridge" network.conf value
X-Git-Tag: v1.1.0pre1~309
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c6f196a050aeae603f5d68ca065a72da9a8ec894;p=sliver-openvswitch.git

xenserver: Don't complain for "bridge" network.conf value

Just silently don't start OVS daemons if /etc/xensource/network.conf
contains a value of "bridge".  This allows the init script to be called
regardless of whether OVS or bridge is configured.
---

diff --git a/xenserver/etc_init.d_openvswitch b/xenserver/etc_init.d_openvswitch
index a2c26a0cb..b9d66480c 100755
--- a/xenserver/etc_init.d_openvswitch
+++ b/xenserver/etc_init.d_openvswitch
@@ -28,8 +28,11 @@ NETWORK_MODE=$(cat /etc/xensource/network.conf)
 case $NETWORK_MODE in
     vswitch|openvswitch)
         ;;
+    bridge)
+        exit 0
+        ;;
     *)
-        echo "Open vSwitch disabled (/etc/xensource/network.conf is not 'openvswitch')" >&2
+        echo "Open vSwitch disabled (/etc/xensource/network.conf is invalid)" >&2
         exit 0
         ;;
 esac