local address=$(xenstore-read "/local/domain/$DOMID/device/vif/$DEVID/mac" 2>/dev/null)
if [ -n "${address}" ] ; then
- set_vif_external_id "xs-vif-mac" "${address}"
+ set_vif_external_id "attached-mac" "${address}"
fi
if $xs550; then
local vif_details=$(handle_vswitch_vif_details $bridge)
fi
- $vsctl -- --if-exists del-port $dev -- add-port $bridge $dev $vif_details
+ $vsctl --timeout=30 -- --if-exists del-port $dev -- add-port $bridge $dev $vif_details
;;
esac
# 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.
- $vsctl -- --if-exists del-port $dev
+ $vsctl --timeout=30 -- --if-exists del-port $dev
;;
esac
}