فهرست منبع

base-files: Fix race-conditions with IPv6 sysctls

SVN-Revision: 35368
Steven Barth 13 سال پیش
والد
کامیت
ea7c9c85a8

+ 1 - 1
package/base-files/Makefile

@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=129
+PKG_RELEASE:=130
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host

+ 3 - 0
package/base-files/files/etc/init.d/boot

@@ -95,6 +95,9 @@ start() {
 		rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline)
 		[ -n "$rootdev" ] && ln -s "$rootdev" /dev/root
 	}
+
+	# run early sysctl
+	[ -f /etc/sysctl_early.conf ] && sysctl -p /etc/sysctl_early.conf -e >&-
 }
 
 stop() {

+ 2 - 1
package/base-files/files/etc/sysctl.conf

@@ -12,7 +12,8 @@ net.ipv4.tcp_timestamps=1
 net.ipv4.tcp_sack=1
 net.ipv4.tcp_dsack=1
 
-net.ipv6.conf.default.forwarding=1
+net.ipv6.conf.default.forwarding=2
+net.ipv6.conf.all.forwarding=2
 
 net.netfilter.nf_conntrack_acct=1
 net.netfilter.nf_conntrack_checksum=0

+ 3 - 0
package/base-files/files/etc/sysctl_early.conf

@@ -0,0 +1,3 @@
+# Avoid race-conditions with SLAAC
+net.ipv6.conf.default.accept_ra=0
+net.ipv6.conf.all.accept_ra=0