projects
/
kernel-cn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* izmjena imena iz kernel-2.6-cn u genericki kernel-cn
[kernel-cn.git]
/
debian
/
preinst
diff --git
a/debian/preinst
b/debian/preinst
index
01a7582
..
6c5b763
100755
(executable)
--- a/
debian/preinst
+++ b/
debian/preinst
@@
-1,5
+1,5
@@
#!/bin/sh
#!/bin/sh
-# preinst script for kernel-2.6-cn
+# preinst script for kernel-cn
#
# see: dh_installdeb(1)
#
# see: dh_installdeb(1)
@@
-19,6
+19,11
@@
case "$1" in
;;
abort-upgrade)
;;
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
;;
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."
# make GRUB template directory
if [ ! -d /boot/grub ]; then
echo "CN: Made /boot/grub directory."
@@
-35,23
+46,15
@@
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
################################################################################
################################################################################
-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.
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.