- nova inacica paketa koja prestaje ovisiti o ExecShield ojacanoj verziji,

[kernel-cn.git] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index deb7984..2167bed 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -134,21 +134,24 @@ fi
 echo -n " grub2"
 
 # workaround grsec
-if [ -x /sbin/chpax ]; then
-    if [ -x /usr/sbin/grub ]; then
-        chpax -spmrx /usr/sbin/grub || true
+if uname -a | grep -q grsec; then
+    if [ -x /sbin/chpax ]; then
+        # grub
+        if [ -x /usr/sbin/grub.real ]; then
+            chpax -spmrx /usr/sbin/grub.real >/dev/null 2>&1 || true
+        elif [ -x /usr/sbin/grub ]; then
+            chpax -spmrx /usr/sbin/grub >/dev/null 2>&1 || true
+        fi
+
+        # grub-probe
+        if [ -x /usr/sbin/grub-probe.real ]; then
+            chpax -spmrx /usr/sbin/grub-probe.real >/dev/null 2>&1 || true
+        elif [ -x /usr/sbin/grub-probe ]; then
+            chpax -spmrx /usr/sbin/grub-probe >/dev/null 2>&1 || true
+        fi
+
+        echo -n " grsec"
     fi
-    if [ -x /usr/sbin/grub-probe ]; then
-        chpax -spmrx /usr/sbin/grub-probe || true
-    fi
-fi
-echo -n " grub3"
-
-# workaround execshield
-SHIELD=$(sysctl -e -n kernel.exec-shield)
-if [ ! -z "$SHIELD" ]; then
-    sysctl -e -w kernel.exec-shield=0 >/dev/null 2>&1
-    echo -n " execshield1"
 fi
 
 # remove obsolete devfs/compat links and restore normal udev behaviour
@@ -173,10 +176,10 @@ if [ ! -s "$device_map" ]; then
         mv -f "$device_map.old" "$device_map"
     fi
 
-:q!else
+else
     rm -f "$device_map.old"
 fi
-echo -n " grub4"
+echo -n " grub3"
 
 # import GRUB helper functions (again, updated device map)
 . /usr/share/kernel-2.6-cn/grub-functions.sh
@@ -205,7 +208,7 @@ if [ -h "$install_device" ]; then
             || true
     fi
 fi
-echo -n " grub5"
+echo -n " grub4"
 
 # install GRUB loader
 if ! grub-install --no-floppy "$install_device" >/dev/null 2>&1; then
@@ -214,7 +217,7 @@ if ! grub-install --no-floppy "$install_device" >/dev/null 2>&1; then
     echo "CN: Do not reboot your server and report this to OTRS immediately!"
     exit 1
 fi
-echo -n " grub6"
+echo -n " grub5"
 
 # fix possible wrong params in menu.lst
 cp_check_and_sed '^# groot=' \
@@ -224,7 +227,7 @@ cp_check_and_sed '^# kopt=' \
   "s;^# kopt=\(.*\)root=[^[:space:]]*\(.*\);# kopt=\1root=$root_device\2;g" \
       "$menu_file" || true
 /usr/sbin/update-grub >/dev/null 2>&1 || true
-echo -n " grub7"
+echo -n " grub6"
 
 # and final stage of devfs/udev brokeness fix
 if [ "x$install_device_resolved" != "x$install_device" ]; then
@@ -249,13 +252,7 @@ if [ "x$install_device_resolved" != "x$install_device" ]; then
       "s;\(^kernel.*\)root=[^[:space:]]*\(.*\);\1root=$root_device\2;g" \
           "$menu_file" || true
 fi
-echo -n " grub8"
-
-# restore execshield state
-if [ ! -z "$SHIELD" ]; then
-    sysctl -e -w "kernel.exec-shield=$SHIELD" >/dev/null 2>&1
-    echo -n " execshield2"
-fi
+echo -n " grub7"
 
 # disable lilo
 if [ -e /etc/lilo.conf ]; then
@@ -314,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
@@ -339,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