2009-05-04 18:38:09 +02:00
|
|
|
Index: xen-3.4.0-testing/tools/hotplug/Linux/network-bridge
|
2008-05-24 00:00:43 +02:00
|
|
|
===================================================================
|
2009-05-04 18:38:09 +02:00
|
|
|
--- xen-3.4.0-testing.orig/tools/hotplug/Linux/network-bridge
|
|
|
|
|
+++ xen-3.4.0-testing/tools/hotplug/Linux/network-bridge
|
|
|
|
|
@@ -262,18 +262,18 @@ op_stop () {
|
2008-05-24 00:00:43 +02:00
|
|
|
transfer_addrs ${bridge} ${pdev}
|
|
|
|
|
if ! ifdown ${bridge}; then
|
|
|
|
|
get_ip_info ${bridge}
|
|
|
|
|
- fi
|
|
|
|
|
- ip link set ${pdev} down
|
|
|
|
|
- ip addr flush ${bridge}
|
|
|
|
|
+ ip link set ${pdev} down
|
|
|
|
|
+ ip addr flush ${bridge}
|
|
|
|
|
|
|
|
|
|
- brctl delif ${bridge} ${pdev}
|
|
|
|
|
- ip link set ${bridge} down
|
|
|
|
|
+ brctl delif ${bridge} ${pdev}
|
|
|
|
|
+ ip link set ${bridge} down
|
|
|
|
|
|
|
|
|
|
- ip link set ${bridge} name ${tdev}
|
|
|
|
|
+ ip link set ${bridge} name ${tdev}
|
|
|
|
|
+ brctl delbr ${tdev}
|
|
|
|
|
+ fi
|
|
|
|
|
+ ip link set ${pdev} down
|
|
|
|
|
ip link set ${pdev} name ${netdev}
|
|
|
|
|
do_ifup ${netdev}
|
|
|
|
|
-
|
|
|
|
|
- brctl delbr ${tdev}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# adds $dev to $bridge but waits for $dev to be in running state first
|
