From: Steven Barth <cyrus@openwrt.org>
Date: Tue, 11 Jun 2013 14:11:18 +0000 (+0000)
Subject: AA: base-files: backport r36920
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=536c823730bf5f67e521eec3ed61a106118fe914;p=openwrt%2Fsvn-archive%2Farchive.git

AA: base-files: backport r36920

SVN-Revision: 36921
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index ee1deea689..2152eddcf4 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:=118.1
+PKG_RELEASE:=118.2
 
 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 1895f93adf..43837a80f2 100755
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -95,13 +95,6 @@ start() {
 		rootdev=$(awk 'BEGIN { RS=" "; FS="="; } $1 == "root" { print $2 }' < /proc/cmdline)
 		[ -n "$rootdev" ] && ln -s "$rootdev" /dev/root
 	}
-
-	# 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() {