X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fetc%2Finit.d%2Fnetwork;h=9d4904ae4301d14f1dcc38b3bcf5011914c2d560;hb=HEAD;hp=e77db02517decf8345699140cad726cc0169dfcc;hpb=7252622410f6b736d049618b6c9745d7002b73d6;p=openwrt-10.03%2F.git

diff --git a/package/base-files/files/etc/init.d/network b/package/base-files/files/etc/init.d/network
index e77db0251..9d4904ae4 100755
--- a/package/base-files/files/etc/init.d/network
+++ b/package/base-files/files/etc/init.d/network
@@ -2,24 +2,36 @@
 # Copyright (C) 2006 OpenWrt.org
 
 START=40
-STOP=40
+STOP=90
 
 boot() {
 	setup_switch() { return 0; }
 
 	include /lib/network
 	setup_switch
-	[ -s /etc/config/wireless ] || \
+	grep -qs config /etc/config/wireless && {
+		/sbin/wifi up
+	} || {
+		rm -f /etc/config/wireless
 		/sbin/wifi detect > /etc/config/wireless
-	/sbin/wifi up
-}
+	}
 
-start() {
-	ifup -a
-	/sbin/wifi up
+	scan_interfaces
+
+	local ifc
+	for ifc in $interfaces; do
+		local proto
+		config_get proto "$ifc" proto
+
+		local auto
+		config_get_bool auto "$ifc" auto 1
+
+		type "coldplug_interface_$proto" >/dev/null && [ "$auto" = 1 ] && \
+			coldplug_interface_$proto "$ifc"
+	done
 }
 
-restart() {
+start() {
 	setup_switch() { return 0; }
 	
 	include /lib/network
@@ -31,3 +43,7 @@ restart() {
 stop() {
 	ifdown -a
 }
+
+restart() {
+	start
+}