AA: base-files: backport r36918

SVN-Revision: 36919

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index b012b80a766b551a7de4a02b0261d8082228c1f6..ee1deea689fb6ed4647c82152de364b97ac27b1a 100644 (file)
--- 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:=118
+PKG_RELEASE:=118.1
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host

diff --git a/package/base-files/files/etc/sysctl.conf b/package/base-files/files/etc/sysctl.conf
index 890e77af8ef8b18855156f33230c93077fc05e64..89527df9f83758c4c2505d7dc85fa30886df47fa 100644 (file)
--- a/package/base-files/files/etc/sysctl.conf
+++ b/package/base-files/files/etc/sysctl.conf
@@ -12,8 +12,8 @@ net.ipv4.tcp_timestamps=1
 net.ipv4.tcp_sack=1
 net.ipv4.tcp_dsack=1
 
-net.ipv6.conf.default.forwarding=2
-net.ipv6.conf.all.forwarding=2
+net.ipv6.conf.default.forwarding=1
+net.ipv6.conf.all.forwarding=1
 
 net.netfilter.nf_conntrack_acct=1
 net.netfilter.nf_conntrack_checksum=0