base-files: move /tmp/resolv.conf.auto to /tmp/resolv.conf.d/

[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..44311c9e230ec5debc5305a12475035ba32da30f 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -2,7 +2,20 @@
 # Copyright (C) 2006-2011 OpenWrt.org
 
 START=10
-STOP=98
+STOP=90
+
+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
@@ -13,36 +26,27 @@ 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
        touch /var/log/lastlog
-       touch /tmp/resolv.conf.auto
-       ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
+       mkdir -p /tmp/resolv.conf.d
+       touch /tmp/resolv.conf.d/resolv.conf.auto
+       ln -sf /tmp/resolv.conf.d/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
 
        /sbin/kmodloader
 
-       # allow wifi modules time to settle
-       sleep 1
-
-       /sbin/wifi detect > /tmp/wireless.tmp
-       [ -s /tmp/wireless.tmp ] && {
-               cat /tmp/wireless.tmp >> /etc/config/wireless
+       [ ! -f /etc/config/wireless ] && {
+               # compat for brcm47xx and mvebu
+               sleep 1
        }
-       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
-       }
 }