From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Tue, 1 Nov 2011 12:00:54 +0000 (+0100)
Subject: initscripts: Remove sysctl.conf from package.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9b8f00edea15f80d1819373140868117ec90e3b;p=people%2Fms%2Fipfire-3.x.git

initscripts: Remove sysctl.conf from package.

The network settings from that file will be done by the network package.
---

diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm
index 42ad32d95..ad1141ec7 100644
--- a/initscripts/initscripts.nm
+++ b/initscripts/initscripts.nm
@@ -6,7 +6,7 @@
 name       = initscripts
 epoch      = 1
 version    = 2.99
-release    = 9
+release    = 10
 
 groups     = Base System/Boot
 url        =
@@ -44,8 +44,6 @@ build
 	install
 		cd src && make install clean DESTDIR=%{BUILDROOT}
 
-		cp -vf %{DIR_SOURCE}/sysctl.conf %{BUILDROOT}/etc
-
 		# Install udev rules
 		mkdir -pv %{BUILDROOT}/lib/udev/rules.d/
 		cp -vf %{DIR_SOURCE}/udev/* %{BUILDROOT}/lib/udev/rules.d/
diff --git a/initscripts/sysctl.conf b/initscripts/sysctl.conf
deleted file mode 100644
index 25d8c92cd..000000000
--- a/initscripts/sysctl.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-net.ipv4.ip_forward = 1
-net.ipv4.ip_dynaddr = 1
-net.ipv4.icmp_echo_ignore_broadcasts = 1
-net.ipv4.icmp_ignore_bogus_error_responses = 1
-
-net.ipv4.tcp_sack = 0
-net.ipv4.tcp_timestamps = 0
-net.ipv4.tcp_syncookies = 1
-net.ipv4.tcp_fin_timeout = 30
-net.ipv4.tcp_window_scaling = 0
-net.ipv4.tcp_syn_retries = 3
-net.ipv4.tcp_synack_retries = 3
-
-net.ipv4.conf.default.rp_filter = 0
-net.ipv4.conf.default.accept_redirects = 0
-net.ipv4.conf.default.accept_source_route = 0
-net.ipv4.conf.default.log_martians = 1
-
-net.ipv4.conf.all.rp_filter = 0
-net.ipv4.conf.all.accept_redirects = 0
-net.ipv4.conf.all.accept_source_route = 0
-net.ipv4.conf.all.log_martians = 1
-
-# IPv6 settings
-net.ipv6.conf.default.forwarding = 1
-net.ipv6.conf.default.autoconf = 0
-
-kernel.printk = 1 4 1 7