# Keep other-config/ keys in sync with device.ml:vif_udev_keys
-cfg_mod="/root/vswitch/bin/ovs-cfg-mod"
-dump_vif_details="/root/vswitch/scripts/dump-vif-details"
+vsctl="/usr/bin/ovs-vsctl"
+dump_vif_details="/usr/share/vswitch/scripts/dump-vif-details"
service="/sbin/service"
TYPE=`echo ${XENBUS_PATH} | cut -f 2 -d '/'`
fi
logger -t scripts-vif "Adding ${vif} to ${bridge} with address ${address}"
- vid=
- if [ -e "/var/lib/openvswitch/br-$bridge" ]; then
- . "/var/lib/openvswitch/br-$bridge"
- if [ -n "$VLAN_SLAVE" -a -n "$VLAN_VID" ]; then
- bridge=$VLAN_SLAVE
- vid="--add=vlan.$vif.tag=$VLAN_VID"
- fi
- fi
-
${IP} link set "${vif}" down || logger -t scripts-vif "Failed to ip link set ${vif} down"
${IP} link set "${vif}" arp off || logger -t scripts-vif "Failed to ip link set ${vif} arp off"
${IP} link set "${vif}" multicast off || logger -t scripts-vif "Failed to ip link set ${vif} multicast off"
logger -t scripts-vif "Failed to retrieve vif details for vswitch"
fi
- $cfg_mod -F /etc/ovs-vswitchd.conf \
- --del-match="bridge.*.port=$vif" \
- --del-match="vlan.$vif.trunks=*" \
- --del-match="vlan.$vif.tag=*" \
- --del-match="port.$vif.[!0-9]*" \
- --add="bridge.$bridge.port=$vif" \
- $vid $vif_details -c
- $service vswitch reload
+ $vsctl add-port $bridge $vif $vif_details
${IP} link set "${vif}" up || logger -t scripts-vif "Failed to ip link set ${vif} up"
}