base-files: Fix race-conditions with IPv6 sysctls

[openwrt/staging/lynxis.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 0d7e11ceddb051f27bb7bf5da12cafd3201d204a..18003423676e2ef69f3bf6ae96794efd1452e980 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -1,39 +1,106 @@
 #!/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
+
+       local hostname conloglevel timezone
+
+       config_get hostname "$cfg" hostname 'OpenWrt'
+       echo "$hostname" > /proc/sys/kernel/hostname
+
+       config_get conloglevel "$cfg" conloglevel
+       config_get buffersize "$cfg" buffersize
+       [ -z "$conloglevel" -a -z "$buffersize" ] || dmesg ${conloglevel:+-n $conloglevel} ${buffersize:+-s $buffersize}
+
+       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
+
+       # apply timezone to kernel
+       date -k
+
+       if [ -x /sbin/syslogd ]; then
+               local args log_ip log_size log_port log_type log_file
+               config_get log_ip "$cfg" log_ip 
+               config_get log_size "$cfg" log_size 16
+               config_get log_port "$cfg" log_port 514
+               config_get log_type "$cfg" log_type circular
+               config_get log_file "$cfg" log_file "/var/log/messages"
+               args="${log_ip:+-L -R ${log_ip}:${log_port}} ${conloglevel:+-l $conloglevel}"
+               if [ "$log_type" = "file" ]; then
+                       args="$args -s $log_size -O $log_file -S"
+               else
+                       args="$args -C${log_size}"
+               fi
+               service_start /sbin/syslogd $args
+       fi
+       if [ -x /sbin/klogd ]; then
+               config_get klogconloglevel "$cfg" klogconloglevel
+               args="${klogconloglevel:+-c $klogconloglevel}"
+               service_start /sbin/klogd $args
+       fi
+}
+
+apply_uci_config() {
+       sh -c '. /lib/functions.sh; include /lib/config; uci_apply_defaults'
 }
 
 start() {
        [ -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 /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 && 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 --max-children 1 &
-       echo /sbin/hotplug-call > /proc/sys/kernel/hotplug
 
        load_modules /etc/modules.d/*
+
+       # 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
+       }
+       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-rules-file /etc/hotplug2.rules \
+                       --set-coldplug-cmd /sbin/udevtrigger \
+                       --max-children 1 >/dev/null 2>&1 &
+
+       # 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
+       }
+
+       # run early sysctl
+       [ -f /etc/sysctl_early.conf ] && sysctl -p /etc/sysctl_early.conf -e >&-
+}
+
+stop() {
+       service_stop /sbin/klogd
+       service_stop /sbin/syslogd
 }