From: Steven Barth <cyrus@openwrt.org>
Date: Fri, 1 Feb 2013 12:28:24 +0000 (+0000)
Subject: base-files: Fix IPv6 early sysctls again * Kernel IPv6 /proc interface inconsistency... 
X-Git-Tag: reboot~11420
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=92ad26d1b6b65d33555c773374687f49f55b929c;p=oweals%2Fopenwrt.git

base-files: Fix IPv6 early sysctls again * Kernel IPv6 /proc interface inconsistency caused races

SVN-Revision: 35417
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 8943c469d8..99db435e86 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=130
+PKG_RELEASE:=131
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 1800342367..005c4ad6f8 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 6f2eeea040..0000000000
--- 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