X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fetc_init.d_openvswitch-xapi-update;h=14d2cc9bd78faf8555f683bce80c1c71bbfd8f91;hb=9d7c56431990fc56a1b26dd32c1e7a8d9258345f;hp=bc62ba2132dd0ab68069a27376cb8bd4afa365d9;hpb=22c75d5933268496fb6f131aa5ea63fbca4122d1;p=sliver-openvswitch.git

diff --git a/xenserver/etc_init.d_openvswitch-xapi-update b/xenserver/etc_init.d_openvswitch-xapi-update
index bc62ba213..14d2cc9bd 100755
--- a/xenserver/etc_init.d_openvswitch-xapi-update
+++ b/xenserver/etc_init.d_openvswitch-xapi-update
@@ -18,6 +18,15 @@
 # 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
 
@@ -30,6 +39,23 @@ function start {
         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
 }