fix a race condition with dynamic interfaces and firewalling

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

diff --git a/package/base-files/files/etc/hotplug.d/iface/00-netstate b/package/base-files/files/etc/hotplug.d/iface/00-netstate
index fce5472cf2d9f7d547484bf5efcd7648866416df..6bf621437508fe77b02103fe944c455862269cf1 100644 (file)
--- a/package/base-files/files/etc/hotplug.d/iface/00-netstate
+++ b/package/base-files/files/etc/hotplug.d/iface/00-netstate
@@ -1,6 +1,3 @@
 [ ifup = "$ACTION" ] && {
        uci set "/var/state/network.$INTERFACE.up=1"
-       [ -z "$DEVICE" ] || {
-               uci set "/var/state/network.$INTERFACE.ifname=$DEVICE"
-       }
 }

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index c384b3e142124238a5b60295c4418fb2aab396d2..3ff65ff8f564b559ae8159638bffced43abd65d4 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -137,6 +137,7 @@ setup_interface() {
        config_get mtu "$config" mtu
        config_get macaddr "$config" macaddr
        $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
+       uci set "/var/state/network.$config.ifname=$iface"
 
        pidfile="/var/run/$iface.pid"
        case "$proto" in