summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-04-24 12:05:52 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-04-24 12:05:52 +0000
commit2d4bdf6086f4808ee79583b6067450689e28df19 (patch)
treeb88c0e3adba436ca1c52dd37c032600bc6516687
parent0554700c3e8397e8cc8b3a06d4d9b44240b9be5d (diff)
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
-rw-r--r--package/base-files/Makefile5
-rw-r--r--target/linux/generic-2.4/base-files/etc/sysctl.conf (renamed from package/base-files/files/etc/sysctl.conf)0
-rw-r--r--target/linux/generic-2.6/base-files/etc/sysctl.conf10
3 files changed, 14 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 1e1610c5d..e267b7f78 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/target/linux/generic-2.4/base-files/etc/sysctl.conf
index e60038cf3..e60038cf3 100644
--- a/package/base-files/files/etc/sysctl.conf
+++ b/target/linux/generic-2.4/base-files/etc/sysctl.conf
diff --git a/target/linux/generic-2.6/base-files/etc/sysctl.conf b/target/linux/generic-2.6/base-files/etc/sysctl.conf
new file mode 100644
index 000000000..a05498cd6
--- /dev/null
+++ b/target/linux/generic-2.6/base-files/etc/sysctl.conf
@@ -0,0 +1,10 @@
+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