base-files: load modules early, run wifi detect afterwards and only then process uci defaults
this allows uci-defaults scripts to override wifi settings SVN-Revision: 28733
This commit is contained in:
parent
e3daeabda3
commit
44ba13b578
2 changed files with 12 additions and 11 deletions
|
@ -10,11 +10,6 @@ boot() {
|
|||
include /lib/network
|
||||
setup_switch
|
||||
|
||||
/sbin/wifi detect > /tmp/wireless.tmp
|
||||
[ -s /tmp/wireless.tmp ] && {
|
||||
cat /tmp/wireless.tmp >> /etc/config/wireless
|
||||
}
|
||||
rm -f /tmp/wireless.tmp
|
||||
grep -qs config /etc/config/wireless && {
|
||||
/sbin/wifi up
|
||||
}
|
||||
|
|
|
@ -52,10 +52,6 @@ start() {
|
|||
[ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
|
||||
[ -f /proc/net/vlan/config ] && vconfig set_name_type DEV_PLUS_VID_NO_PAD
|
||||
|
||||
apply_uci_config
|
||||
config_load system
|
||||
config_foreach system_config system
|
||||
|
||||
mkdir -p /var/run
|
||||
mkdir -p /var/log
|
||||
mkdir -p /var/lock
|
||||
|
@ -69,6 +65,18 @@ start() {
|
|||
grep -q debugfs /proc/filesystems && mount -t debugfs debugfs /sys/kernel/debug
|
||||
[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
|
||||
|
||||
load_modules /etc/modules.d/*
|
||||
|
||||
/sbin/wifi detect > /tmp/wireless.tmp
|
||||
[ -s /tmp/wireless.tmp ] && {
|
||||
cat /tmp/wireless.tmp >> /etc/config/wireless
|
||||
}
|
||||
rm -f /tmp/wireless.tmp
|
||||
|
||||
apply_uci_config
|
||||
config_load system
|
||||
config_foreach system_config system
|
||||
|
||||
killall -q hotplug2
|
||||
[ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
|
||||
--set-worker /lib/hotplug2/worker_fork.so \
|
||||
|
@ -86,8 +94,6 @@ start() {
|
|||
[ -n "$rootdev" ] && ln -s "$rootdev" /dev/root
|
||||
}
|
||||
|
||||
load_modules /etc/modules.d/*
|
||||
|
||||
# another round of USB coldplugging to kick devices into operation which lacked drivers before
|
||||
for dev in /sys/bus/usb/devices/*/uevent; do
|
||||
[ -e "$dev" ] && echo -n add > "$dev"
|
||||
|
|
Loading…
Reference in a new issue