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

Accepting request 35384 from Virtualization

Browse Source 
checked in (request 35384)

OBS-URL: https://build.opensuse.org/request/show/35384
OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=36
This commit is contained in:
OBS User autobuild
2010-03-21 10:57:54 +00:00
committed by Git OBS Bridge
parent a9bb3bc2f5
commit daed39e878
27 changed files with 311 additions and 930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bridge-vlan.diff
View File

@@ -2,7 +2,7 @@ Index: xen-4.0.0-testing/tools/hotplug/Linux/network-bridge
===================================================================
--- xen-4.0.0-testing.orig/tools/hotplug/Linux/network-bridge
+++ xen-4.0.0-testing/tools/hotplug/Linux/network-bridge
@@ -193,6 +193,28 @@ antispoofing () {
@@ -191,6 +191,28 @@ antispoofing () {
iptables -A FORWARD -m physdev --physdev-in ${pdev} -j ACCEPT
}
@@ -31,9 +31,9 @@ Index: xen-4.0.0-testing/tools/hotplug/Linux/network-bridge
# Usage: show_status dev bridge
# Print ifconfig and routes.
show_status () {
@@ -223,6 +245,9 @@ op_start () {
claim_lock "network-bridge"
@@ -219,6 +241,9 @@ op_start () {
return
fi
+ vlans=$(find_active_vlans "${netdev}")
+ for vlan in $vlans ; do ifdown $vlan ; done
@@ -41,7 +41,7 @@ Index: xen-4.0.0-testing/tools/hotplug/Linux/network-bridge
create_bridge ${tdev}
preiftransfer ${netdev}
@@ -250,6 +275,8 @@ op_start () {
@@ -246,6 +271,8 @@ op_start () {
add_to_bridge2 ${bridge} ${pdev}
do_ifup ${bridge}
@@ -50,9 +50,9 @@ Index: xen-4.0.0-testing/tools/hotplug/Linux/network-bridge
if [ ${antispoof} = 'yes' ] ; then
antispoofing
fi
@@ -267,6 +294,9 @@ op_stop () {
claim_lock "network-bridge"
@@ -259,6 +286,9 @@ op_stop () {
return
fi
+ vlans=$(find_active_vlans "${netdev}")
+ for vlan in $vlans ; do ifdown $vlan ; done
@@ -60,12 +60,12 @@ Index: xen-4.0.0-testing/tools/hotplug/Linux/network-bridge
transfer_addrs ${bridge} ${pdev}
if ! ifdown ${bridge}; then
get_ip_info ${bridge}
@@ -283,6 +313,8 @@ op_stop () {
@@ -274,6 +304,8 @@ op_stop () {
ip link set ${pdev} down
ip link set ${pdev} name ${netdev}
do_ifup ${netdev}
+ for vlan in $vlans ; do ifup $vlan ; done
+
release_lock "network-bridge"
+ for vlan in $vlans ; do ifup $vlan ; done
}
# adds $dev to $bridge but waits for $dev to be in running state first