xenserver: Don't complain for "bridge" network.conf value
authorJustin Pettit <jpettit@nicira.com>
Tue, 8 Jun 2010 19:53:46 +0000 (12:53 -0700)
committerJustin Pettit <jpettit@nicira.com>
Tue, 8 Jun 2010 19:53:46 +0000 (12:53 -0700)
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.

xenserver/etc_init.d_openvswitch

index a2c26a0..b9d6648 100755 (executable)
@@ -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