swconfig: fix vlan/port configs being applied to all switches

[openwrt.git] / package / base-files / files / etc / init.d / network

diff --git a/package/base-files/files/etc/init.d/network b/package/base-files/files/etc/init.d/network
index d60d41a..fc51221 100755 (executable)
--- a/package/base-files/files/etc/init.d/network
+++ b/package/base-files/files/etc/init.d/network
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 
 START=40
 STOP=90
@@ -9,11 +9,14 @@ boot() {
 
        include /lib/network
        setup_switch
+
+       /sbin/wifi detect > /tmp/wireless.tmp
+       [ -s /tmp/wireless.tmp ] && {
+               cat /tmp/wireless.tmp >> /etc/config/wireless
+       }
+       rm -f /tmp/wireless.tmp
        grep -qs config /etc/config/wireless && {
                /sbin/wifi up
-       } || {
-               rm -f /etc/config/wireless
-               /sbin/wifi detect > /etc/config/wireless
        }
 
        scan_interfaces
@@ -23,7 +26,10 @@ boot() {
                local proto
                config_get proto "$ifc" proto
 
-               type "coldplug_interface_$proto" >/dev/null && \
+               local auto
+               config_get_bool auto "$ifc" auto 1
+
+               type "coldplug_interface_$proto" >/dev/null && [ "$auto" = 1 ] && \
                        coldplug_interface_$proto "$ifc"
        done
 }