X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=kernel-cn.git;a=blobdiff_plain;f=debian%2Fpreinst;h=6c5b763d5b7aa2bdff471c443f696e6f7a42e06d;hp=cef091656ff15a6881917e757ed19a09a2d03356;hb=8e63ec3203b5575cd88940fea9ee242d7725b531;hpb=8485a58b8bcc5205c18cf8c3f65386c9e70b7dd0

diff --git a/debian/preinst b/debian/preinst
index cef0916..6c5b763 100755
--- a/debian/preinst
+++ b/debian/preinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-# preinst script for kernel-2.6-cn
+# preinst script for kernel-cn
 #
 # see: dh_installdeb(1)
 
@@ -19,6 +19,11 @@ case "$1" in
     ;;
 
     abort-upgrade)
+        # check if we have Layer7 active...
+        if iptables-save | grep -qs '^-A.* -m layer7 '; then
+            echo 'CN: Layer7 Netfilter no longer supported, report this to SysHelp!'
+            exit 1
+        fi
     ;;
 
     *)
@@ -27,6 +32,12 @@ case "$1" in
     ;;
 esac
 
+# check if the config script fixed the grub diverts
+if [ -e /usr/sbin/grub.real -o -e /usr/sbin/grub-probe.real ]; then
+    echo "CN: Please install Grub2 package using: apt-get install grub-pc"
+    exit 1
+fi
+
 # make GRUB template directory
 if [ ! -d /boot/grub ]; then
     echo "CN: Made /boot/grub directory."
@@ -35,15 +46,14 @@ fi
 
 ################################################################################
 
-DIVERT_TO="grub grub-probe"
+SHIELD=$(sysctl -e -n kernel.exec-shield)
 
-echo -n "CN: Diverting binaries:"
-for i in $DIVERT_TO; do
-    dpkg-divert --add --rename --package 'kernel-2.6-cn' \
-        --divert /usr/sbin/$i.real /usr/sbin/$i >/dev/null
-    echo -n " $i"
-done
-echo "."
+if [ ! -z "$SHIELD" ]; then
+    sysctl -e -w kernel.exec-shield=0 >/dev/null 2>&1 || true
+    echo "CN: Disabled Exec-Shield."
+fi
+
+################################################################################
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.