KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

base-files: load modules early, run wifi detect afterwards and only then process uci defaults

Browse source 
this allows uci-defaults scripts to override wifi settings

SVN-Revision: 28733
This commit is contained in:
Felix Fietkau 2011-11-03 20:02:25 +00:00
parent e3daeabda3
commit 44ba13b578
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
package/base-files-network/files/etc/init.d/network
View file

@ -10,11 +10,6 @@ boot() {
include /lib/network include /lib/network
setup_switch 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 && { grep -qs config /etc/config/wireless && {
/sbin/wifi up /sbin/wifi up
} }

18
package/base-files/files/etc/init.d/boot
View file

@ -52,10 +52,6 @@ start() {
[ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc [ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
[ -f /proc/net/vlan/config ] && vconfig set_name_type DEV_PLUS_VID_NO_PAD [ -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/run
mkdir -p /var/log mkdir -p /var/log
mkdir -p /var/lock mkdir -p /var/lock
@ -69,6 +65,18 @@ start() {
grep -q debugfs /proc/filesystems && mount -t debugfs debugfs /sys/kernel/debug grep -q debugfs /proc/filesystems && mount -t debugfs debugfs /sys/kernel/debug
[ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe [ "$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 killall -q hotplug2
[ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \ [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
--set-worker /lib/hotplug2/worker_fork.so \ --set-worker /lib/hotplug2/worker_fork.so \
@ -86,8 +94,6 @@ start() {
[ -n "$rootdev" ] && ln -s "$rootdev" /dev/root [ -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 # another round of USB coldplugging to kick devices into operation which lacked drivers before
for dev in /sys/bus/usb/devices/*/uevent; do for dev in /sys/bus/usb/devices/*/uevent; do
[ -e "$dev" ] && echo -n add > "$dev" [ -e "$dev" ] && echo -n add > "$dev"