base-files: process platform hotplug calls in the early launch of hotplug2 to avoid...

[openwrt.git] / package / base-files / files / etc / init.d / boot

diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 2fec48c..7f6b267 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -19,6 +19,9 @@ system_config() {
        config_get timezone "$cfg" timezone 'UTC'
        echo "$timezone" > /tmp/TZ
 
+       config_get zonename "$cfg" zonename
+       [ -n "$zonename" ] && [ -f "/usr/share/zoneinfo/$zonename" ] && ln -s "/usr/share/zoneinfo/$zonename" /tmp/localtime
+
        if [ -x /sbin/syslogd ]; then
                local log_ip log_size log_port log_type log_file
                config_get log_ip "$cfg" log_ip 
@@ -49,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
@@ -66,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 \
@@ -83,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"