add protection for bridging interface changes

[openwrt.git] / package / base-files / default / sbin / ifup

diff --git a/package/base-files/default/sbin/ifup b/package/base-files/default/sbin/ifup
index c7055d4..35b2fc4 100755 (executable)
--- a/package/base-files/default/sbin/ifup
+++ b/package/base-files/default/sbin/ifup
@@ -10,5 +10,12 @@ case "$iftype" in
 esac
 
 for dev in $ifname; do
+       brctl show | grep "$dev" >/dev/null && {
+               # interface is still part of a bridge, correct that
+
+               for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
+                       brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null
+               done
+       }
        setup_interface "$dev" "$1"
 done