Revert "fix nonhotpluggable networks not being brought up. Closes #2781" (r17527) until we've solved the race conditions it creates
SVN-Revision: 17544
This commit is contained in:
parent
376fba2698
commit
91d40a14af
3 changed files with 0 additions and 17 deletions
|
@ -4,18 +4,7 @@
|
||||||
START=40
|
START=40
|
||||||
STOP=40
|
STOP=40
|
||||||
|
|
||||||
config_cb() {
|
|
||||||
local cfg_type="$1"
|
|
||||||
|
|
||||||
case "$cfg_type" in
|
|
||||||
interface)
|
|
||||||
append networks "$2" "$N"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
boot() {
|
boot() {
|
||||||
uci_load network
|
|
||||||
setup_switch() { return 0; }
|
setup_switch() { return 0; }
|
||||||
|
|
||||||
include /lib/network
|
include /lib/network
|
||||||
|
@ -23,10 +12,6 @@ boot() {
|
||||||
[ -s /etc/config/wireless ] || \
|
[ -s /etc/config/wireless ] || \
|
||||||
/sbin/wifi detect > /etc/config/wireless
|
/sbin/wifi detect > /etc/config/wireless
|
||||||
/sbin/wifi up
|
/sbin/wifi up
|
||||||
for network in $networks; do
|
|
||||||
config_get startupcheck $network started
|
|
||||||
[ "$startupcheck" = "" ] && ifup $network
|
|
||||||
done
|
|
||||||
}
|
}
|
||||||
|
|
||||||
start() {
|
start() {
|
||||||
|
|
|
@ -153,7 +153,6 @@ set_interface_ifname() {
|
||||||
config_get device "$1" device
|
config_get device "$1" device
|
||||||
uci_set_state network "$config" ifname "$ifname"
|
uci_set_state network "$config" ifname "$ifname"
|
||||||
uci_set_state network "$config" device "$device"
|
uci_set_state network "$config" device "$device"
|
||||||
uci_set_state network "$config" started 1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_interface_none() {
|
setup_interface_none() {
|
||||||
|
|
|
@ -203,7 +203,6 @@ for ifc in $interfaces __default; do
|
||||||
config_get ifname "$ifc" ifname
|
config_get ifname "$ifc" ifname
|
||||||
config_get aliases "$ifc" aliases
|
config_get aliases "$ifc" aliases
|
||||||
uci_revert_state network "$ifc"
|
uci_revert_state network "$ifc"
|
||||||
uci_set_state network "$ifc" started 1
|
|
||||||
[ -n "$device" ] && uci_set_state network "$ifc" device "$device"
|
[ -n "$device" ] && uci_set_state network "$ifc" device "$device"
|
||||||
[ -n "$ifname" ] && uci_set_state network "$ifc" ifname "$ifname"
|
[ -n "$ifname" ] && uci_set_state network "$ifc" ifname "$ifname"
|
||||||
[ -n "$aliases" ] && uci_set_state network "$ifc" aliases "$aliases"
|
[ -n "$aliases" ] && uci_set_state network "$ifc" aliases "$aliases"
|
||||||
|
|
Loading…
Reference in a new issue