X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=xenserver%2Fetc_xensource_scripts_vif;h=240cb7098728241a9f52bd1ff77dde7e07341c28;hb=87eeed4c03ebb0847c093eeb8a6b7af5f2fd33af;hp=ab9a56ee17a8295da6f6b9d03d724bf29df9bb32;hpb=c0f9490c24649855f36b9cb426decd600e5c3115;p=openvswitch

diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index ab9a56ee..240cb709 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
@@ -47,7 +47,7 @@ handle_promiscuous()
 		esac
 		;;
 	    vswitch)
-		logger -t script-vif "${dev}: Promiscuous ports are not supported via vSwitch."
+		logger -t script-vif "${dev}: Promiscuous ports are not supported via Open vSwitch."
 		;;
 	esac
     fi
@@ -133,8 +133,8 @@ xs550_set_internal_network_uuid()
         local bridge=$1
         local net_uuid=$(xenstore-read "${PRIVATE}/network-uuid" 2>/dev/null)
         if [ -n "${net_uuid}" ] ; then
-            logger -t scripts-vif "${bridge} xs-network-uuids ${net_uuid}"
-            echo "-- br-set-external-id $bridge xs-network-uuids ${net_uuid}"
+            logger -t scripts-vif "${bridge} network-uuids ${net_uuid}"
+            echo "-- br-set-external-id $bridge network-uuids ${net_uuid}"
         fi
     fi
 }