# 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
*) 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
${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
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.
fi
case $NETWORK_MODE in
- bridge|vswitch) ;;
+ bridge|openvswitch) ;;
+ vswitch) NETWORK_MODE=openvswitch ;;
*)
logger -t scripts-vif "Unknown network mode $NETWORK_MODE"
exit 1