From 7f2d4d8bb1019977059c6df31300c3d48d9dc782 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 9 Sep 2009 00:16:55 +0000
Subject: [PATCH] Revert "fix nonhotpluggable networks not being brought up.
Closes #2781" (r17527) until we've solved the race conditions it creates
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17544 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
package/base-files/files/etc/init.d/network | 15 ---------------
package/base-files/files/lib/network/config.sh | 1 -
.../files/usr/share/udhcpc/default.script | 1 -
3 files changed, 17 deletions(-)
diff --git a/package/base-files/files/etc/init.d/network b/package/base-files/files/etc/init.d/network
index 75103ec07..e77db0251 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 12a3378b8..bfadf40c8 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 ea0a28b3a..b32b2c9f2 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"
--
2.20.1