base-files: do not bring up wlan interfaces from hotplug events, so that wrong networ...

[openwrt/svn-archive/archive.git] / package / base-files / files / etc / hotplug.d / net / 10-net

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 9b72338ce88ea51b34629667ace3b95f701d22c1..ef590046452ecfdceb9e0c8e0f04952e41bdd12b 100644 (file)
--- a/package/base-files/files/etc/hotplug.d/net/10-net
+++ b/package/base-files/files/etc/hotplug.d/net/10-net
@@ -3,6 +3,19 @@
 include /lib/network
 
 addif() {
+       # Ensure that ipv6 is loaded, autoloading happens later but ipv6 might be
+       # required now for interface setup.
+       [ -d /proc/sys/net/ipv6 ] || {
+               grep -q '^ipv6' /etc/modules.d/* && insmod ipv6
+       }
+
+       # PPP devices are configured by pppd, no need to run setup_interface here
+       case "$INTERFACE" in
+               ppp*) return 0;;
+               ath*) return 0;;
+               wlan*) return 0;;
+       esac
+
        scan_interfaces
        local cfg="$(find_config "$INTERFACE")"
 
@@ -25,6 +38,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
@@ -32,4 +63,7 @@ case "$ACTION" in
                esac
                addif
        ;;
+       remove|unregister)
+               delif
+       ;;
 esac