Awesome! Thank you!!
On 11/3/11 2:02 PM, openwrt-comm...@openwrt.org wrote:
> Author: nbd
> Date: 2011-11-03 21:02:25 +0100 (Thu, 03 Nov 2011)
> New Revision: 28733
>
> Modified:
> trunk/package/base-files-network/files/etc/init.d/network
> trunk/package/base-files/files/etc/init.d/boot
> Log:
> base-files: load modules early, run wifi detect afterwards and only then
> process uci defaults
>
> this allows uci-defaults scripts to override wifi settings
>
> Modified: trunk/package/base-files/files/etc/init.d/boot
> ===================================================================
> --- trunk/package/base-files/files/etc/init.d/boot 2011-11-03 19:25:25 UTC
> (rev 28732)
> +++ trunk/package/base-files/files/etc/init.d/boot 2011-11-03 20:02:25 UTC
> (rev 28733)
> @@ -52,10 +52,6 @@
> [ -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 @@
> 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 @@
> [ -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"
>
> Modified: trunk/package/base-files-network/files/etc/init.d/network
> ===================================================================
> --- trunk/package/base-files-network/files/etc/init.d/network 2011-11-03
> 19:25:25 UTC (rev 28732)
> +++ trunk/package/base-files-network/files/etc/init.d/network 2011-11-03
> 20:02:25 UTC (rev 28733)
> @@ -10,11 +10,6 @@
> 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
> }
>
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
