base-files: let config_generate call board_detect

[openwrt/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 c644b2fec2d9ccf0c817fffbcc0eea84e65df08c..904f7db75e90de1d22637e1649ac8305240656cd 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -1,39 +1,55 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 
 START=10
+STOP=98
 
-system_config() {
-       local cfg="$1"
-       local hostname
-       
-       config_get hostname "$cfg" hostname
-       echo "${hostname:-OpenWrt}" > /proc/sys/kernel/hostname
+uci_apply_defaults() {
+       . /lib/functions/system.sh
+
+       cd /etc/uci-defaults || return 0
+       files="$(ls)"
+       [ -z "$files" ] && return 0
+       mkdir -p /tmp/.uci
+       for file in $files; do
+               ( . "./$(basename $file)" ) && rm -f "$file"
+       done
+       uci commit
 }
 
-start() {
+boot() {
        [ -f /proc/mounts ] || /sbin/mount_root
        [ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
-       vconfig set_name_type DEV_PLUS_VID_NO_PAD
-       
-       config_load system
-       config_foreach system_config system
-       
+       [ -f /proc/net/vlan/config ] && vconfig set_name_type DEV_PLUS_VID_NO_PAD
+
        mkdir -p /var/run
        mkdir -p /var/log
        mkdir -p /var/lock
+       mkdir -p /var/state
+       mkdir -p /var/tmp
+       mkdir -p /tmp/.uci
+       chmod 0700 /tmp/.uci
        touch /var/log/wtmp
        touch /var/log/lastlog
-       ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
+       touch /tmp/resolv.conf.auto
+       ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
+       grep -q debugfs /proc/filesystems && /bin/mount -o noatime -t debugfs debugfs /sys/kernel/debug
        [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
-       
-       # manually trigger hotplug before loading modules
-       for iface in $(awk -F: '/:/ {print $1}' /proc/net/dev); do
-               /usr/bin/env -i ACTION=add INTERFACE="$iface" /sbin/hotplug-call net
-       done
 
-       /sbin/hotplug2 --persistent &
-       echo /sbin/hotplug-call > /proc/sys/kernel/hotplug
+       /sbin/kmodloader
+
+       # allow wifi modules time to settle
+       sleep 1
 
-       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
+
+       /bin/config_generate
+       uci_apply_defaults
+       
+       # temporary hack until configd exists
+       /sbin/reload_config
 }