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 43837a8..67db0d2 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -24,27 +24,6 @@ system_config() {
 
        # 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() {
@@ -66,7 +45,7 @@ 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
 
        load_modules /etc/modules.d/*
@@ -84,20 +63,16 @@ start() {
        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
        }
-}
 
-stop() {
-       service_stop /sbin/klogd
-       service_stop /sbin/syslogd
+       # 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
 }