X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=a36cf364a09d42f8915f4513e9fc387f7c802ac1;hb=refs%2Fheads%2Flenny;hp=05e3d63374bc52aebcd61453efbd67a9b4b4afca;hpb=3ae9cfd0860afe734c6d96e33d9d4ec320497c9f;p=kernel-cn.git

diff --git a/debian/postinst b/debian/postinst
index 05e3d63..a36cf36 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -69,6 +69,20 @@ echo "CN: Removed old symlinks in / and /boot."
 
 ################################################################################
 
+DIVERT_TO="grub grub-probe"
+
+echo -n "CN: Undiverting binaries:"
+for i in $DIVERT_TO; do
+    if [ -e /usr/sbin/$i.real ]; then
+            dpkg-divert --remove --rename --package 'kernel-2.6-cn' \
+                --divert /usr/sbin/$i.real /usr/sbin/$i >/dev/null
+        echo -n " $i"
+    fi
+done
+echo "."
+
+################################################################################
+
 # intro msg
 echo -n "CN: Configuring system (this will take a while):"
 
@@ -312,6 +326,7 @@ fi
 rm -f /etc/sysctl.conf.$$
 cat > /etc/sysctl.conf.$$ <<'EOF'
 kernel.maps_protect=1
+kernel.exec-shield=0
 net.core.rmem_default=1048576
 net.core.wmem_default=1048576
 net.ipv4.conf.all.accept_redirects=0
@@ -332,9 +347,9 @@ net.ipv4.tcp_syncookies=1
 vm.mmap_min_addr=65536
 EOF
 
-# old kernel params
+# 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' \
+    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' \
         /etc/sysctl.conf >> /etc/sysctl.conf.$$
 fi