summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-15 15:44:39 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-10-15 15:44:39 +0000
commit95e7b381e96d1f6e3108500dec66d980739ca058 (patch)
tree4181f61c8d71dce4b1df3d9cf6a89db5a3ff54b1
parent6aa6b0b1a0426116b7ce3a8b891bf230f5bc9e46 (diff)
add protection for bridging interface changes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5115 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/default/sbin/ifup7
1 files changed, 7 insertions, 0 deletions
diff --git a/package/base-files/default/sbin/ifup b/package/base-files/default/sbin/ifup
index c7055d480..35b2fc4cd 100755
--- 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