X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=xenserver%2Fetc_xensource_scripts_vif;h=e82642953d7552d7a7d9b56bd75e9b77ade9a64a;hb=fb0d597fb64308c60001e3afc9b31eb295dedb6b;hp=56c710d814cfbd679b5ca23ddb171fa8384c6f6b;hpb=5c43922c13983d2b5addf9e6dd3f54a006c568a6;p=openvswitch

diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index 56c710d8..e8264295 100755
--- a/xenserver/etc_xensource_scripts_vif
+++ b/xenserver/etc_xensource_scripts_vif
@@ -28,7 +28,7 @@ vsctl="/usr/bin/ovs-vsctl"
 # XAPI before build 29381 (approximately) did not provide some of the
 # data in XenStore that we rely on.
 . /etc/xensource-inventory
-if test "$PRODUCT_VERSION" = "5.5.0" || test "${BUILD_NUMBER%p}" -le 26131
+if test "$PRODUCT_VERSION" = "5.5.0" || test "${BUILD_NUMBER%[a-z]}" -le 26131
 then
     xs550=true
 else
@@ -46,8 +46,8 @@ handle_promiscuous()
 		    *) echo 0 > /sys/class/net/${dev}/brport/promisc ;;
 		esac
 		;;
-	    vswitch)
-		logger -t script-vif "${dev}: Promiscuous ports are not supported via vSwitch."
+	    openvswitch)
+		logger -t script-vif "${dev}: Promiscuous ports are not supported via Open vSwitch."
 		;;
 	esac
     fi
@@ -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