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 53c16be8790e4ef94c583fad693f0ec73be93712..18003423676e2ef69f3bf6ae96794efd1452e980 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -48,7 +48,7 @@ system_config() {
 }
 
 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() {
@@ -66,11 +66,14 @@ 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/*
 
+       # 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
@@ -84,23 +87,17 @@ start() {
        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 &
 
-       # 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
-
        # 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
        }
 
-       # another round of USB coldplugging to kick devices into operation which lacked drivers before
-       for dev in /sys/bus/usb/devices/*/uevent; do
-               [ -e "$dev" ] && echo -n add > "$dev"
-       done
+       # run early sysctl
+       [ -f /etc/sysctl_early.conf ] && sysctl -p /etc/sysctl_early.conf -e >&-
 }
 
 stop() {