From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 9 Sep 2009 00:16:55 +0000 (+0000)
Subject: Revert "fix nonhotpluggable networks not being brought up. Closes #2781" (r17527... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=91d40a14affc8478720d8106d83a07265b1e0f36;p=openwrt%2Fstaging%2Flinusw.git

Revert "fix nonhotpluggable networks not being brought up. Closes #2781" (r17527) until we've solved the race conditions it creates

SVN-Revision: 17544
---

diff --git a/package/base-files/files/etc/init.d/network b/package/base-files/files/etc/init.d/network
index 75103ec073..e77db02517 100755
--- a/package/base-files/files/etc/init.d/network
+++ b/package/base-files/files/etc/init.d/network
@@ -4,18 +4,7 @@
 START=40
 STOP=40
 
-config_cb() {
-	local cfg_type="$1"
-
-	case "$cfg_type" in
-		interface)
-			append networks "$2" "$N"
-		;;
-	esac
-}
-
 boot() {
-	uci_load network
 	setup_switch() { return 0; }
 
 	include /lib/network
@@ -23,10 +12,6 @@ boot() {
 	[ -s /etc/config/wireless ] || \
 		/sbin/wifi detect > /etc/config/wireless
 	/sbin/wifi up
-	for network in $networks; do
-		config_get startupcheck $network started
-		[ "$startupcheck" = "" ] && ifup $network
-	done
 }
 
 start() {
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 12a3378b8c..bfadf40c89 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -153,7 +153,6 @@ set_interface_ifname() {
 	config_get device "$1" device
 	uci_set_state network "$config" ifname "$ifname"
 	uci_set_state network "$config" device "$device"
-	uci_set_state network "$config" started 1
 }
 
 setup_interface_none() {
diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
index ea0a28b3ae..b32b2c9f25 100755
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -203,7 +203,6 @@ for ifc in $interfaces __default; do
 				config_get ifname "$ifc" ifname
 				config_get aliases "$ifc" aliases
 				uci_revert_state network "$ifc"
-				uci_set_state network "$ifc" started 1
 				[ -n "$device" ] && uci_set_state network "$ifc" device "$device"
 				[ -n "$ifname" ] && uci_set_state network "$ifc" ifname "$ifname"
 				[ -n "$aliases" ] && uci_set_state network "$ifc" aliases "$aliases"