From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 15 Oct 2006 15:44:39 +0000 (+0000)
Subject: add protection for bridging interface changes
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=5fee2188f5eb10a9ed406f8b5f85727b5dfa6c39;p=openwrt%2Fstaging%2Fmkresin.git

add protection for bridging interface changes

SVN-Revision: 5115
---

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