0c76f22ef1
- bnc#633573 - System fail to boot after running several warm reboot tests 22749-vtd-workarounds.patch - Upstream patches from Jan 22744-ept-pod-locking.patch 22777-vtd-ats-fixes.patch 22781-pod-hap-logdirty.patch 22782-x86-emul-smsw.patch 22789-i386-no-x2apic.patch 22790-svm-resume-migrate-pirqs.patch 22816-x86-pirq-drop-priv-check.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=94
33 lines
898 B
Diff
33 lines
898 B
Diff
Index: xen-4.0.2-testing/tools/hotplug/Linux/network-bridge
|
|
===================================================================
|
|
--- xen-4.0.2-testing.orig/tools/hotplug/Linux/network-bridge
|
|
+++ xen-4.0.2-testing/tools/hotplug/Linux/network-bridge
|
|
@@ -270,19 +270,19 @@ op_stop () {
|
|
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}
|
|
-
|
|
release_lock "network-bridge"
|
|
}
|
|
|