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 45cb4a2596812adf81173ecea9a0d70e79148cae..904f7db75e90de1d22637e1649ac8305240656cd 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -4,6 +4,19 @@
 START=10
 STOP=98
 
+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
+}
+
 boot() {
        [ -f /proc/mounts ] || /sbin/mount_root
        [ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc
@@ -13,6 +26,7 @@ boot() {
        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
@@ -33,16 +47,9 @@ boot() {
        }
        rm -f /tmp/wireless.tmp
 
-       sh -c '. /lib/functions.sh; include /lib/config; uci_apply_defaults'
+       /bin/config_generate
+       uci_apply_defaults
        
        # temporary hack until configd exists
        /sbin/reload_config
-
-       start
-
-       # create /dev/root if it doesn't exist
-       [ -e /dev/root -o -h /dev/root ] || {
-               rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline)
-               [ -n "$rootdev" ] && ln -s "$rootdev" /dev/root
-       }
 }