From: Dinko Korunic <kreator@carnet.hr>
Date: Thu, 28 Apr 2011 13:11:11 +0000 (+0200)
Subject: - reload sysctl variabli kroz procps init skriptu
X-Git-Tag: v2.6.32.1~6
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=75ce3eae72d8ab65d8064fd4e1baf1d2e3fb2aae;p=kernel-cn.git

- reload sysctl variabli kroz procps init skriptu
- ciscenje nepotrebnog kernel.maps sysctla
---

diff --git a/50-carnet.conf b/50-carnet.conf
index 81d1682..a794d4b 100644
--- a/50-carnet.conf
+++ b/50-carnet.conf
@@ -1,5 +1,4 @@
 kernel.core_pattern=%e-%h-%p.core
-kernel.maps_protect=1
 kernel.printk=4 4 1 7
 kernel.sysrq=1
 net.ipv4.conf.all.accept_redirects=0
@@ -16,12 +15,12 @@ net.ipv4.conf.eth0.secure_redirects=1
 net.ipv4.conf.eth0.send_redirects=0
 net.ipv4.icmp_echo_ignore_broadcasts=1
 net.ipv4.icmp_ignore_bogus_error_responses=1
-net.ipv4.tcp_congestion_control=cubic
 net.ipv4.tcp_ecn=0
 net.ipv4.tcp_max_syn_backlog=2048
 net.ipv4.tcp_mtu_probing=1
 net.ipv4.tcp_retries1=2
 net.ipv4.tcp_rfc1337=1
+net.ipv4.tcp_synack_retries=2
 net.ipv4.tcp_syncookies=1
 vm.min_free_kbytes=10240
 vm.mmap_min_addr=65536
diff --git a/debian/changelog b/debian/changelog
index 0949008..d4e6692 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ kernel-2.6-cn (3:2.6.32.1) stable; urgency=low
   * lintian fixevi
   * Grub2 kompatibilnost
   * migracija sa udevsettle na udevadm settle
+  * reload sysctl varijabli kroz init procps skriptu
 
  -- Dinko Korunic <kreator@carnet.hr>  Thu, 28 Apr 2011 09:41:53 +0200
 
diff --git a/debian/postinst b/debian/postinst
index 63cf3b2..6dfe2d6 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -382,7 +382,7 @@ rm -f /etc/sysctl.conf.$$
 
 # old kernel params (skipping some of the obsolete or overrided entries)
 if [ -e /etc/sysctl.conf ]; then
-    egrep -v 'net\.core\.(r|w)mem_max|net\.ipv4\.tcp_(r|w)mem|vm\.bdflush|net\.ipv4\.ip_local_port_range|kernel\.rtsig-max|net\.ipv4\.tcp_syncookies|kernel\.exec-shield|net\.ipv4\.tcp_max_syn_backlog|net\.ipv4\.tcp_congestion_control|kernel\.exec-shield' \
+    egrep -v 'net\.core\.(r|w)mem_max|net\.ipv4\.tcp_(r|w)mem|vm\.bdflush|net\.ipv4\.ip_local_port_range|kernel\.rtsig-max|net\.ipv4\.tcp_syncookies|kernel\.exec-shield|net\.ipv4\.tcp_max_syn_backlog|net\.ipv4\.tcp_congestion_control|kernel\.exec-shield|kernel\.maps_protect' \
         /etc/sysctl.conf >> /etc/sysctl.conf.$$
 fi
 
@@ -390,6 +390,13 @@ fi
 cp_mv /etc/sysctl.conf.$$ /etc/sysctl.conf
 echo -n " sysctl.conf"
 
+# reload sysctl ASAP
+if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+  invoke-rc.d procps restart >/dev/null 2>&1 || true
+else
+  /etc/init.d/procps restart >/dev/null 2>&1 || true
+fi
+
 # finished with basic kernel-2.6-cn stuff
 echo "."