From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 30 Jul 2008 22:39:56 +0000 (+0000)
Subject: network scripts: properly maintain the network state's list of assigned interfaces
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=e49ecf1adf017e6c29406e084f708b5e3228955c;hp=54988ba6a21a46113e5ff96c74145282793f016d

network scripts: properly maintain the network state's list of assigned interfaces


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12026 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/base-files/files/etc/hotplug.d/net/10-net b/package/base-files/files/etc/hotplug.d/net/10-net
index 77eb6da9d..06e524444 100644
--- a/package/base-files/files/etc/hotplug.d/net/10-net
+++ b/package/base-files/files/etc/hotplug.d/net/10-net
@@ -30,6 +30,24 @@ addif() {
 	done
 }
 
+
+delif() {
+	scan_interfaces
+
+	# find all vlan configurations for this interface and nuke 'em
+	for ifc in $interfaces; do
+		config_get iftype "$ifc" type
+		config_get ifs "$ifc" device
+		confdevs="$(uci get network.$ifc.ifname)"
+		for dev in $ifs; do
+			[ "${dev%%\.*}" = "$INTERFACE" ] && {
+				list_contains confdevs "$dev" || list_remove ifs "$dev"
+			}
+		done
+		uci_set_state "network" "$ifc" device "$ifs"
+	done
+}
+
 case "$ACTION" in
 	add|register)
 		case "$PHYSDEVDRIVER" in
@@ -37,4 +55,7 @@ case "$ACTION" in
 		esac
 		addif
 	;;
+	remove|unregister)
+		delif
+	;;
 esac