aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2006-10-15 15:44:39 +0000
committerFelix Fietkau <nbd@openwrt.org>2006-10-15 15:44:39 +0000
commit5fee2188f5eb10a9ed406f8b5f85727b5dfa6c39 (patch)
tree1d075ea64de83c629707b5bb188df1d5cf6d7351
parentcb3692258e40cc4f9431a6ee716eed1cc6dceb3b (diff)
downloadupstream-5fee2188f5eb10a9ed406f8b5f85727b5dfa6c39.tar.gz
upstream-5fee2188f5eb10a9ed406f8b5f85727b5dfa6c39.tar.bz2
upstream-5fee2188f5eb10a9ed406f8b5f85727b5dfa6c39.zip
add protection for bridging interface changes
SVN-Revision: 5115
-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 c7055d4807..35b2fc4cdd 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