X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=kernel-cn.git;a=blobdiff_plain;f=debian%2Fpostinst;h=2167bedb1c0a8f8b25142981f2fad255d7b24d30;hp=3b3d622220ef0b323fcc8f026e32b9198139411a;hb=b4dbb81dbceb3ea7163f9b6e9727f421c0d49195;hpb=8485a58b8bcc5205c18cf8c3f65386c9e70b7dd0

diff --git a/debian/postinst b/debian/postinst
index 3b3d622..2167bed 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -311,7 +311,6 @@ fi
 # default kernel parameters
 rm -f /etc/sysctl.conf.$$
 cat > /etc/sysctl.conf.$$ <<EOF
-kernel.exec-shield=3
 kernel.maps_protect=1
 net.core.rmem_default=1048576
 net.core.wmem_default=1048576
@@ -336,7 +335,7 @@ EOF
 
 # old kernel params
 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' \
+    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' \
         /etc/sysctl.conf >> /etc/sysctl.conf.$$
 fi