X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpreinst;fp=debian%2Fpreinst;h=b680d9aabd928e08f28516f487e726f685a02a7d;hb=b9eef33cb7294d6fb1ea859e4ff2f669ecac94e7;hp=01a7582a79c8dfcbbbbe750c0f131ffb89292a67;hpb=169793af12c005fb81f16ef539c22f80efe13708;p=kernel-cn.git

diff --git a/debian/preinst b/debian/preinst
index 01a7582..b680d9a 100755
--- a/debian/preinst
+++ b/debian/preinst
@@ -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
     ;;
 
     *)
@@ -35,23 +40,27 @@ fi
 
 ################################################################################
 
+SHIELD=$(sysctl -e -n kernel.exec-shield)
+
+if [ ! -z "$SHIELD" ]; then
+    sysctl -e -w kernel.exec-shield=0 >/dev/null 2>&1 || true
+    echo "CN: Disabled Exec-Shield."
+fi
+
+################################################################################
+
 DIVERT_TO="grub grub-probe"
 
-echo -n "CN: Diverting binaries:"
+echo -n "CN: Undiverting 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
+    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
+    fi
     echo -n " $i"
 done
 echo "."
 
-################################################################################
-
-if iptables-save | grep -qs '^-A.* -m layer7 '; then
-    echo 'CN: Layer7 Netfilter no longer supported, report this to SysHelp!'
-    exit 1
-fi
-
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.