rpm/xen
SHA256
1
0
Fork 0
forked from pool/xen
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=1

Browse Source
This commit is contained in:
OBS User unknown
2007-01-15 23:42:10 +00:00
committed by Git OBS Bridge
commit 27044d0668
97 changed files with 14401 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
xen-bonding.diff Normal file
View File

@@ -0,0 +1,65 @@
Index: xen-unstable/tools/examples/network-bridge
===================================================================
--- xen-unstable.orig/tools/examples/network-bridge
+++ xen-unstable/tools/examples/network-bridge
@@ -145,6 +145,21 @@ antispoofing () {
iptables -A FORWARD -m physdev --physdev-in ${vif0} -j ACCEPT
}
+# Find the netdev that is associated with the bridge by matching MAC addresses.
+find_bridged_netdev () {
+ local bridge=$1
+
+ bmac=`ip link show ${bridge} | grep 'link\/ether' | sed -e 's/.*ether \(..:..:..:..:..:..\).*/\1/'`
+ for i in `ls /sys/class/net/${bridge}/brif` ; do
+ mac=`ip link show ${i} | grep 'link\/ether' | sed -e 's/.*ether \(..:..:..:..:..:..\).*/\1/'`
+ if [ "${bmac}" = "${mac}" ] && [ ! "${bridge}" = "${i}" ] ; then
+ netdev=${i}
+ return 0
+ fi
+ done
+ return 1
+}
+
# Usage: show_status dev bridge
# Print ifconfig and routes.
show_status () {
@@ -187,10 +202,11 @@ using loopback.nloopbacks=<N> on the dom
create_bridge ${bridge}
- if link_exists "$vdev"; then
+ preiftransfer
+ . /etc/sysconfig/network/ifcfg-${hwddev}
+ if [ ! "$BONDING_MASTER" = yes ] && link_exists "$vdev"; then
mac=`ip link show ${netdev} | grep 'link\/ether' | sed -e 's/.*ether \(..:..:..:..:..:..\).*/\1/'`
ifup ${netdev} # To ensure there is an IP to transfer
- preiftransfer
transfer_addrs ${netdev} ${vdev}
ifdown ${netdev}
ip link set ${netdev} name ${pdev}
@@ -205,6 +221,13 @@ using loopback.nloopbacks=<N> on the dom
add_to_bridge2 ${bridge} ${pdev}
ip link set ${netdev} up
ifup ${hwddev}
+ elif [ "$BONDING_MASTER" = yes ]; then
+ ip link set ${bridge} arp on
+ add_to_bridge ${bridge} ${vif0}
+ ip link set ${vif0} up
+ add_to_bridge2 ${bridge} ${netdev}
+ transfer_addrs ${netdev} ${bridge}
+ transfer_routes ${netdev} ${bridge}
else
# old style without ${vdev}
transfer_addrs ${netdev} ${bridge}
@@ -243,6 +266,10 @@ op_stop () {
ip link set ${pdev} name ${netdev}
ifup ${netdev}
else
+ if [ ${netdev} = ${bridge} ]; then
+ find_bridged_netdev ${bridge}
+ fi
+ ip link set dev ${vif0} down
transfer_routes ${bridge} ${netdev}
ip link set ${bridge} down
fi