summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-08-04 13:26:41 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-08-04 13:26:41 +0000
commit3c77e53b3f8496c8038f5d7f518451fe7eadd4da (patch)
tree28ef9a3caa5d82d88a4a595538d122d9db9bf73e
parentdd622e2557fa084e4d992e9b7da1315910a45136 (diff)
fix a race condition with dynamic interfaces and firewalling
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8343 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/files/etc/hotplug.d/iface/00-netstate3
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh1
2 files changed, 1 insertions, 3 deletions
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 fce5472cf2..6bf6214375 100644
--- 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 c384b3e142..3ff65ff8f5 100755
--- 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