X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=xenserver%2Fetc_xensource_scripts_vif;h=e82642953d7552d7a7d9b56bd75e9b77ade9a64a;hb=c6278d208924bb04c41266ddca276712f95533bc;hp=240cb7098728241a9f52bd1ff77dde7e07341c28;hpb=2c0f11dc7e66e10257ef927574a99d5f888c774c;p=openvswitch

diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index 240cb709..e8264295 100755
--- a/xenserver/etc_xensource_scripts_vif
+++ b/xenserver/etc_xensource_scripts_vif
@@ -46,7 +46,7 @@ handle_promiscuous()
 		    *) echo 0 > /sys/class/net/${dev}/brport/promisc ;;
 		esac
 		;;
-	    vswitch)
+	    openvswitch)
 		logger -t script-vif "${dev}: Promiscuous ports are not supported via Open vSwitch."
 		;;
 	esac
@@ -164,7 +164,7 @@ add_to_bridge()
 	    ${BRCTL} setfd "${bridge}" 0                        || logger -t scripts-vif "Failed to brctl setfd ${bridge} 0"
 	    ${BRCTL} addif "${bridge}" "${dev}"                 || logger -t scripts-vif "Failed to brctl addif ${bridge} ${dev}"
 	    ;;
-	vswitch)
+	openvswitch)
 	    if [ "$TYPE" = "vif" ] ; then
 		local vif_details=$(handle_vswitch_vif_details)
 	    fi
@@ -182,7 +182,7 @@ remove_from_bridge()
 	bridge)
 	    # Nothing to do
 	    ;;
-	vswitch)
+	openvswitch)
             # If ovs-brcompatd is running, it might already have deleted the
             # port.  Use --if-exists to suppress the error that would otherwise
             # arise in that case.
@@ -202,7 +202,8 @@ else
 fi
 
 case $NETWORK_MODE in
-    bridge|vswitch) ;;
+    bridge|openvswitch) ;;
+    vswitch) NETWORK_MODE=openvswitch ;;
     *)
 	logger -t scripts-vif "Unknown network mode $NETWORK_MODE"
 	exit 1