diff options
| author | Steven Barth <steven@midlink.org> | 2013-06-11 14:11:18 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2013-06-11 14:11:18 +0000 |
| commit | 3f309c015ef0ff626a6ac7d7fdcad761cfba57bf (patch) | |
| tree | 0b9d0f4b54a616c385b40951f69f72fe705aa4ce | |
| parent | c6d9a582fce20c231e47767083a4e92621c7847a (diff) | |
| download | upstream-3f309c015ef0ff626a6ac7d7fdcad761cfba57bf.tar.gz upstream-3f309c015ef0ff626a6ac7d7fdcad761cfba57bf.tar.bz2 upstream-3f309c015ef0ff626a6ac7d7fdcad761cfba57bf.zip | |
AA: base-files: backport r36920
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36921 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/etc/init.d/boot | 7 |
2 files changed, 1 insertions, 8 deletions
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() { |