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 a2c26a0cbd1b2c69b1e32e1ea1dadd1eedf96493..b9d66480c0442d413773a0af82d6748b3905e12f 100755 (executable)
--- 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