git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fatal-signal: New function fatal_signal_unlink_file_now().
[sliver-openvswitch.git]
/
xenserver
/
etc_xensource_scripts_vif
diff --git
a/xenserver/etc_xensource_scripts_vif
b/xenserver/etc_xensource_scripts_vif
index
fb7517a
..
04aa2bb
100755
(executable)
--- a/
xenserver/etc_xensource_scripts_vif
+++ b/
xenserver/etc_xensource_scripts_vif
@@
-11,8
+11,8
@@
# Keep other-config/ keys in sync with device.ml:vif_udev_keys
# 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"
+cfg_mod="/
usr
/bin/ovs-cfg-mod"
+dump_vif_details="/
usr/share
/vswitch/scripts/dump-vif-details"
service="/sbin/service"
TYPE=`echo ${XENBUS_PATH} | cut -f 2 -d '/'`
service="/sbin/service"
TYPE=`echo ${XENBUS_PATH} | cut -f 2 -d '/'`
@@
-31,8
+31,8
@@
handle_promiscuous()
local arg=$(xenstore-read "${PRIVATE}/other-config/promiscuous")
if [ $? -eq 0 -a -n "${arg}" ] ; then
case "${arg}" in
local arg=$(xenstore-read "${PRIVATE}/other-config/promiscuous")
if [ $? -eq 0 -a -n "${arg}" ] ; then
case "${arg}" in
- true|on)
echo 1 > /sys/class/net/${vif}/brport/promisc
;;
- *)
echo 0 > /sys/class/net/${vif}/brport/promisc
;;
+ true|on)
logger -t script-vif "${vif}: Promiscuous ports are not supported via vSwitch."
;;
+ *) ;;
esac
fi
}
esac
fi
}
@@
-71,8
+71,8
@@
add_to_bridge()
logger -t scripts-vif "Adding ${vif} to ${bridge} with address ${address}"
vid=
logger -t scripts-vif "Adding ${vif} to ${bridge} with address ${address}"
vid=
- if [ -e "/
etc
/openvswitch/br-$bridge" ]; then
- . "/
etc
/openvswitch/br-$bridge"
+ 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"
if [ -n "$VLAN_SLAVE" -a -n "$VLAN_VID" ]; then
bridge=$VLAN_SLAVE
vid="--add=vlan.$vif.tag=$VLAN_VID"