X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=debian%2Fifupdown.sh;h=a621100b36a0a5c38d232abe9e0b876d3474ff67;hb=HEAD;hp=ea36a0dca8fbfa0a8fd8512ca34188ba6b45cb84;hpb=86b87c92669daca4c69f412de2cc42c255368c4f;p=sliver-openvswitch.git

diff --git a/debian/ifupdown.sh b/debian/ifupdown.sh
index ea36a0dca..a621100b3 100755
--- a/debian/ifupdown.sh
+++ b/debian/ifupdown.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (c) 2012 Nicira, Inc.
+# Copyright (c) 2012, 2013 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ if [ -z "${IF_OVS_TYPE}" ]; then
 fi
 
 ovs_vsctl() {
-    ovs-vsctl --no-wait --timeout=5 "$@"
+    ovs-vsctl --timeout=5 "$@"
 }
 
 if (ovs_vsctl --version) > /dev/null 2>&1; then :; else
@@ -61,6 +61,16 @@ if [ "${MODE}" = "start" ]; then
                     ${OVS_EXTRA+-- $OVS_EXTRA}
 
                 ifconfig "${IFACE}" up
+                for slave in ${IF_OVS_BONDS}
+                do
+                    ifconfig "${slave}" up
+                done
+                ;;
+        OVSTunnel)
+                ovs_vsctl -- --may-exist add-port "${IF_OVS_BRIDGE}"\
+                    "${IFACE}" ${IF_OVS_OPTIONS} -- set Interface "${IFACE}" \
+                    type=${IF_OVS_TUNNEL_TYPE} ${IF_OVS_TUNNEL_OPTIONS} \
+                    ${OVS_EXTRA+-- $OVS_EXTRA}
                 ;;
         *)
                 exit 0
@@ -75,7 +85,7 @@ elif [ "${MODE}" = "stop" ]; then
 
                 ovs_vsctl -- --if-exists del-br "${IFACE}"
                 ;;
-        OVSPort|OVSIntPort|OVSBond)
+        OVSPort|OVSIntPort|OVSBond|OVSTunnel)
                 ovs_vsctl -- --if-exists del-port "${IF_OVS_BRIDGE}" "${IFACE}"
                 ;;
         *)