From 8a0e57cc7c94f77a98f973b06e04bdfc8fb5adf6 Mon Sep 17 00:00:00 2001 From: cyrus Date: Fri, 1 Feb 2013 12:28:24 +0000 Subject: base-files: Fix IPv6 early sysctls again * Kernel IPv6 /proc interface inconsistency caused races git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35417 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/init.d/boot | 8 ++++++-- package/base-files/files/etc/sysctl_early.conf | 3 --- 2 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 package/base-files/files/etc/sysctl_early.conf (limited to 'package/base-files/files/etc') diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index 180034236..005c4ad6f 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -96,8 +96,12 @@ start() { [ -n "$rootdev" ] && ln -s "$rootdev" /dev/root } - # run early sysctl - [ -f /etc/sysctl_early.conf ] && sysctl -p /etc/sysctl_early.conf -e >&- + # 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 } stop() { diff --git a/package/base-files/files/etc/sysctl_early.conf b/package/base-files/files/etc/sysctl_early.conf deleted file mode 100644 index 6f2eeea04..000000000 --- a/package/base-files/files/etc/sysctl_early.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Avoid race-conditions with SLAAC -net.ipv6.conf.default.accept_ra=0 -net.ipv6.conf.all.accept_ra=0 -- cgit v1.2.3