aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2013-02-01 12:28:24 +0000
committerSteven Barth <steven@midlink.org>2013-02-01 12:28:24 +0000
commit9cfe24046887c34f44847419173e1dbc02c57478 (patch)
tree96ecc7d79f360bc4e81e8700f9aa2e29e3f1faea
parent81c98af4d4f463719d356bc3bd3eba5c03c021fd (diff)
downloadmaster-187ad058-9cfe24046887c34f44847419173e1dbc02c57478.tar.gz
master-187ad058-9cfe24046887c34f44847419173e1dbc02c57478.tar.bz2
master-187ad058-9cfe24046887c34f44847419173e1dbc02c57478.zip
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
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/etc/init.d/boot8
-rw-r--r--package/base-files/files/etc/sysctl_early.conf3
3 files changed, 7 insertions, 6 deletions
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