Revert "fix nonhotpluggable networks not being brought up. Closes #2781" (r17527...

SVN-Revision: 17544

diff --git a/package/base-files/files/etc/init.d/network b/package/base-files/files/etc/init.d/network
index 75103ec073d9d2ad9b59ca0b197c332f00731284..e77db02517decf8345699140cad726cc0169dfcc 100755 (executable)
--- 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 12a3378b8c3ca94c59b317aa9d8e64a0f075f4f5..bfadf40c89e8577ab16f488e15c647b6c5dec926 100755 (executable)
--- 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 ea0a28b3aecf2e9aefda4bafbbff96a96e7bd78c..b32b2c9f256e5c941f2fe0e5fd0f98399ded6dad 100755 (executable)
--- 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"