diff options
| author | Steven Barth <cyrus@openwrt.org> | 2013-01-29 10:13:33 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2013-01-29 10:13:33 +0000 |
| commit | ea7c9c85a8bc5b6b91594572b60ef20d5763c932 (patch) | |
| tree | eca04e9743add0c07cc8ce270ebeb8a08a368ed9 | |
| parent | 714b2cfef3d4736cfbc62c5f45c7b62f7afa67e1 (diff) | |
| download | upstream-ea7c9c85a8bc5b6b91594572b60ef20d5763c932.tar.gz upstream-ea7c9c85a8bc5b6b91594572b60ef20d5763c932.tar.bz2 upstream-ea7c9c85a8bc5b6b91594572b60ef20d5763c932.zip | |
base-files: Fix race-conditions with IPv6 sysctls
SVN-Revision: 35368
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/etc/init.d/boot | 3 | ||||
| -rw-r--r-- | package/base-files/files/etc/sysctl.conf | 3 | ||||
| -rw-r--r-- | package/base-files/files/etc/sysctl_early.conf | 3 |
4 files changed, 9 insertions, 2 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 353b9ae392..8943c469d8 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:=129 +PKG_RELEASE:=130 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 ef97383d8d..1800342367 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/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() { diff --git a/package/base-files/files/etc/sysctl.conf b/package/base-files/files/etc/sysctl.conf index 1841dd4ca5..890e77af8e 100644 --- a/package/base-files/files/etc/sysctl.conf +++ b/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 diff --git a/package/base-files/files/etc/sysctl_early.conf b/package/base-files/files/etc/sysctl_early.conf new file mode 100644 index 0000000000..6f2eeea040 --- /dev/null +++ b/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 |