base-files: move sysctl init after boot

[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 c3019df..67db0d2 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 
 START=10
 STOP=98
@@ -15,29 +15,19 @@ system_config() {
        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
 
-       if [ -x /sbin/syslogd ]; then
-               local 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"
-               if [ "$log_type" = "file" ]; then
-                       syslogd -s $log_size -O $log_file ${log_ip:+-L -R ${log_ip}:${log_port}} -S
-               else
-                       syslogd -C${log_size} ${log_ip:+-L -R ${log_ip}:${log_port}}
-               fi
-       fi
-       config_get klogconloglevel "$cfg" klogconloglevel
-       [ -x /sbin/klogd ] && klogd ${klogconloglevel:+-c $klogconloglevel}
+       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
 }
 
 apply_uci_config() {
-       sh -c '. /etc/functions.sh; include /lib/config; uci_apply_defaults'
+       sh -c '. /lib/functions.sh; include /lib/config; uci_apply_defaults'
 }
 
 start() {
@@ -45,10 +35,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
@@ -59,19 +45,23 @@ start() {
        touch /var/log/lastlog
        touch /tmp/resolv.conf.auto
        ln -sf /tmp/resolv.conf.auto /tmp/resolv.conf
-       grep -q debugfs /proc/filesystems && mount -t debugfs debugfs /sys/kernel/debug
+       grep -q debugfs /proc/filesystems && mount -o noatime -t debugfs debugfs /sys/kernel/debug
        [ "$FAILSAFE" = "true" ] && touch /tmp/.failsafe
 
-       killall -q hotplug2
-       [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
-                       --set-worker /lib/hotplug2/worker_fork.so \
-                       --set-rules-file /etc/hotplug2.rules \
-                       --max-children 1 >/dev/null 2>&1 &
+       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
 
-       # the coldplugging of network interfaces needs to happen later, so we do it manually here
-       for iface in $(awk -F: '/:/ {print $1}' /proc/net/dev); do
-               /usr/bin/env -i ACTION=add INTERFACE="$iface" /sbin/hotplug-call net
-       done
+       apply_uci_config
+       config_load system
+       config_foreach system_config system
 
        # create /dev/root if it doesn't exist
        [ -e /dev/root -o -h /dev/root ] || {
@@ -79,10 +69,10 @@ start() {
                [ -n "$rootdev" ] && ln -s "$rootdev" /dev/root
        }
 
-       load_modules /etc/modules.d/*
-}
-
-stop() {
-        killall -9 syslogd 2> /dev/null
+       # early sysctl to avoid networking races
+       if [ -d /proc/sys/net/ipv6/conf ]; then
+               for i in /proc/sys/net/ipv6/conf/*/accept_ra; do
+                       echo 0 > $i
+               done
+       fi
 }
-