base-files: fix wrong sysctl parameter order

[openwrt/openwrt.git] / package / base-files / files / etc / init.d / sysctl

diff --git a/package/base-files/files/etc/init.d/sysctl b/package/base-files/files/etc/init.d/sysctl
index 35d5e30c75114fc70960c78cbe93b62faa735991..4db56444c7c6e1ee9b6e92f8afab41b082799107 100755 (executable)
--- a/package/base-files/files/etc/init.d/sysctl
+++ b/package/base-files/files/etc/init.d/sysctl
@@ -1,7 +1,44 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org 
+# Copyright (C) 2006 OpenWrt.org
+
+START=11
+
+apply_defaults() {
+       local mem="$(awk '/^MemTotal:/ {print $2}' /proc/meminfo)"
+       local min_free frag_low_thresh frag_high_thresh
+
+       if [ "$mem" -gt 65536 ]; then # 128M
+               min_free=16384
+       elif [ "$mem" -gt 32768 ]; then # 64M
+               min_free=8192
+       else
+               min_free=1024
+               frag_low_thresh=393216
+               frag_high_thresh=524288
+       fi
+
+       sysctl -qw vm.min_free_kbytes="$min_free"
+
+       [ "$frag_low_thresh" ] && sysctl -qw \
+               net.ipv4.ipfrag_low_thresh="$frag_low_thresh" \
+               net.ipv4.ipfrag_high_thresh="$frag_high_thresh" \
+               net.ipv6.ip6frag_low_thresh="$frag_low_thresh" \
+               net.ipv6.ip6frag_high_thresh="$frag_high_thresh" \
+               net.netfilter.nf_conntrack_frag6_low_thresh="$frag_low_thresh" \
+               net.netfilter.nf_conntrack_frag6_high_thresh="$frag_high_thresh"
+
+       # first set default, then all interfaces to avoid races with appearing interfaces
+       if [ -d /proc/sys/net/ipv6/conf ]; then
+               echo 0 > /proc/sys/net/ipv6/conf/default/accept_ra
+               for iface in /proc/sys/net/ipv6/conf/*/accept_ra; do
+                       echo 0 > "$iface"
+               done
+       fi
+}
 
-START=99
 start() {
-       [ -f /etc/sysctl.conf ] && sysctl -p >&-
+       apply_defaults
+       for CONF in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
+               [ -f "$CONF" ] && sysctl -e -p "$CONF" >&-
+       done
 }