aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-11-03 20:02:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-11-03 20:02:25 +0000
commit44ba13b57890b62ecd30ba8a7ce2758e5b44ee89 (patch)
tree56f0a6042ca4eef7e2247e7ec5db522a667be2b1
parente3daeabda38fff68d4a6f82869dfaa9068cf0e4e (diff)
downloadupstream-44ba13b57890b62ecd30ba8a7ce2758e5b44ee89.tar.gz
upstream-44ba13b57890b62ecd30ba8a7ce2758e5b44ee89.tar.bz2
upstream-44ba13b57890b62ecd30ba8a7ce2758e5b44ee89.zip
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
-rwxr-xr-xpackage/base-files-network/files/etc/init.d/network5
-rwxr-xr-xpackage/base-files/files/etc/init.d/boot18
2 files changed, 12 insertions, 11 deletions
diff --git a/package/base-files-network/files/etc/init.d/network b/package/base-files-network/files/etc/init.d/network
index fc512216f8..ad73e60375 100755
--- a/package/base-files-network/files/etc/init.d/network
+++ b/package/base-files-network/files/etc/init.d/network
@@ -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
}
diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 346d60d04b..7f6b26791b 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -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"