aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-04-24 12:05:52 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-04-24 12:05:52 +0000
commitcd3c2a39aabaa6192034ace7e981b45f5b05bce9 (patch)
treeb88c0e3adba436ca1c52dd37c032600bc6516687 /package
parenta674e08fafed09460954bfe267c52d590d3598bf (diff)
downloadupstream-cd3c2a39aabaa6192034ace7e981b45f5b05bce9.tar.gz
upstream-cd3c2a39aabaa6192034ace7e981b45f5b05bce9.tar.bz2
upstream-cd3c2a39aabaa6192034ace7e981b45f5b05bce9.zip
use separate sysctl.conf files for 2.4 and 2.6 - fixes some boot message spam
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7043 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile5
-rw-r--r--package/base-files/files/etc/sysctl.conf12
2 files changed, 4 insertions, 13 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1e1610c5d7..e267b7f78b 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -13,7 +13,7 @@ PKG_NAME:=base-files
PKG_RELEASE:=8
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
-PKG_FILE_DEPEND:=$(PLATFORM_DIR)
+PKG_FILE_DEPEND:=$(PLATFORM_DIR) $(GENERIC_PLATFORM_DIR)/base-files
REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
ifeq ($(REV),)
@@ -110,6 +110,9 @@ endef
define Package/base-files$(TARGET)/install
$(CP) ./files/* $(1)/
+ if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \
+ $(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \
+ fi
if [ -d $(PLATFORM_DIR)/base-files/default/. ]; then \
$(CP) $(PLATFORM_DIR)/base-files/default/* $(1)/; \
fi
diff --git a/package/base-files/files/etc/sysctl.conf b/package/base-files/files/etc/sysctl.conf
deleted file mode 100644
index e60038cf35..0000000000
--- a/package/base-files/files/etc/sysctl.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-kernel.panic=3
-net.ipv4.conf.default.arp_ignore=1
-net.ipv4.conf.all.arp_ignore=1
-net.ipv4.ip_forward=1
-net.ipv4.icmp_echo_ignore_broadcasts=1
-net.ipv4.icmp_ignore_bogus_error_responses=1
-net.ipv4.tcp_fin_timeout=30
-net.ipv4.tcp_keepalive_time=120
-net.ipv4.tcp_syncookies=1
-net.ipv4.tcp_timestamps=0
-net.ipv4.ip_conntrack_tcp_timeouts="300 43200 120 60 120 120 10 60 30 120"
-net.ipv4.ip_conntrack_udp_timeouts="60 180"