base-files: make the skipping of ppp interfaces in 10-net hotplug more explicit,...

[openwrt/staging/dedeckeh.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 77eb6da9d4352a27abb400471e21f29efb97c970..4744a1e8100a8b4c88fe3a33e078320788701839 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,9 +3,17 @@
 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;;
+               3g-*|ppp-*|pppoa-*|pppoe-*|pptp-*) return 0;;
+               ath*) return 0;;
+               wlan*) return 0;;
        esac
 
        scan_interfaces
@@ -30,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
@@ -37,4 +63,7 @@ case "$ACTION" in
                esac
                addif
        ;;
+       remove|unregister)
+               delif
+       ;;
 esac