SHA256
1
0
forked from pool/xen

Updating link to change in openSUSE:Factory/xen revision 86.0

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=2cde1443cbaf9b44fea7d2345354b1f7
This commit is contained in:
OBS User buildservice-autocommit
2010-03-21 10:57:55 +00:00
committed by Git OBS Bridge
parent daed39e878
commit 6327676635
27 changed files with 930 additions and 311 deletions

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
@@ -191,6 +191,28 @@ antispoofing () {
@@ -193,6 +193,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 () {
@@ -219,6 +241,9 @@ op_start () {
return
fi
@@ -223,6 +245,9 @@ op_start () {
claim_lock "network-bridge"
+ 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}
@@ -246,6 +271,8 @@ op_start () {
@@ -250,6 +275,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
@@ -259,6 +286,9 @@ op_stop () {
return
fi
@@ -267,6 +294,9 @@ op_stop () {
claim_lock "network-bridge"
+ 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}
@@ -274,6 +304,8 @@ op_stop () {
ip link set ${pdev} down
@@ -283,6 +313,8 @@ op_stop () {
ip link set ${pdev} name ${netdev}
do_ifup ${netdev}
+
+ for vlan in $vlans ; do ifup $vlan ; done
+
release_lock "network-bridge"
}
# adds $dev to $bridge but waits for $dev to be in running state first