diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-11-03 20:02:25 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-11-03 20:02:25 +0000 |
commit | 05ecf259d67d4756669a3925fe5062c6f7546ddd (patch) | |
tree | a1e1e3e8c3577958d8df4b26ab0c1e5536f17619 /package/base-files/files/etc/init.d | |
parent | c16e9c5abffca46c528a0fac114b49447d9f21f9 (diff) | |
download | master-187ad058-05ecf259d67d4756669a3925fe5062c6f7546ddd.tar.gz master-187ad058-05ecf259d67d4756669a3925fe5062c6f7546ddd.tar.bz2 master-187ad058-05ecf259d67d4756669a3925fe5062c6f7546ddd.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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28733 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files/etc/init.d')
-rwxr-xr-x | package/base-files/files/etc/init.d/boot | 18 |
1 files changed, 12 insertions, 6 deletions
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" |