X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fetc_init.d_openvswitch-xapi-update;h=14d2cc9bd78faf8555f683bce80c1c71bbfd8f91;hb=a8a4d9565ba652b2f610ffad4e78d1f9068248ad;hp=1c5f0798ca114e4cc5d53228e46baf386b134498;hpb=bc39196036f8e33d15274855087f0c47be2095ee;p=sliver-openvswitch.git

diff --git a/xenserver/etc_init.d_openvswitch-xapi-update b/xenserver/etc_init.d_openvswitch-xapi-update
index 1c5f0798c..14d2cc9bd 100755
--- a/xenserver/etc_init.d_openvswitch-xapi-update
+++ b/xenserver/etc_init.d_openvswitch-xapi-update
@@ -1,11 +1,11 @@
 #!/bin/bash
 #
-# vswitch-xapi-update
+# openvswitch-xapi-update
 #
 # chkconfig: 2345 95 01
-# description: Update vswitch configuration from XAPI database at boot
+# description: Update Open vSwitch configuration from XAPI database at boot
 
-# Copyright (C) 2009 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010 Nicira Networks, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,18 +18,44 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+### BEGIN INIT INFO
+# Provides:      openvswitch-xapi-update
+# Required-Start: $network $remote_fs
+# Required-Stop: $network
+# Default-Start:  3 5
+# Default-Stop:
+# Short-Description:    openvswitch-xapi-update
+# Description:          reconfigures Open vSwitch based on XAPI configuration
+### END INIT INFO
 
 . /etc/init.d/functions
 
 function do_host_call {
-    xe host-call-plugin host-uuid="$INSTALLATION_UUID" plugin="vswitch-cfg-update" fn="update" >/dev/null
+    xe host-call-plugin host-uuid="$INSTALLATION_UUID" plugin="openvswitch-cfg-update" fn="update" >/dev/null
 }
 
 function start {
     if [ ! -f /etc/xensource-inventory ]; then
-        printf "vswitch-xapi-update ERROR: XenSource inventory not present in /etc/xensource-inventory\n"
+        printf "openvswitch-xapi-update ERROR: XenSource inventory not present in /etc/xensource-inventory\n"
         exit 1
     fi
+
+    if test -e /etc/xensource/network.conf; then
+        NETWORK_MODE=$(cat /etc/xensource/network.conf)
+    fi
+
+    case ${NETWORK_MODE:=openvswitch} in
+        vswitch|openvswitch)
+            ;;
+        bridge)
+            exit 0
+            ;;
+        *)
+            echo "Open vSwitch disabled (/etc/xensource/network.conf is invalid)" >&2
+            exit 0
+            ;;
+    esac
+
     source /etc/xensource-inventory
     action "Updating configuration" do_host_call
 }
@@ -45,7 +71,7 @@ case "$1" in
         start
         ;;
     help)
-        printf "vswitch-xapi-update [start|stop|restart]\n"
+        printf "openvswitch-xapi-update [start|stop|restart]\n"
         ;;
     *)
         printf "Unknown command: $1\n"