X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=6105c82b770cfe2a6147a30a2e28152ce360448a;hb=refs%2Fheads%2Fetch;hp=a4b757778ac2c97dab98e618306022d37c94cc27;hpb=d19c2c3da15c2b8550146e66031fb51938cd125f;p=kernel-cn.git

diff --git a/debian/postinst b/debian/postinst
index a4b7577..6105c82 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -130,28 +130,31 @@ fi
 echo -n " grub2"
 
 # workaround grsec
-if [ -x /sbin/chpax ]; then
-    if [ -x /usr/sbin/grub ]; then
-        chpax -spmrx /usr/sbin/grub || true
-    fi
-    if [ -x /usr/sbin/grub-probe ]; then
-        chpax -spmrx /usr/sbin/grub-probe || 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
 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
 rm -f /etc/udev/rules.d/devfs.rules /etc/udev/rules.d/compat.rules \
     /etc/udev/rules.d/compat-full.rules
 if [ ! -e /etc/udev/rules.d/udev.rules ]; then
-    ln -s ../udev.rules /etc/udev/rules.d/udev.rules
+    ln -sf ../udev.rules /etc/udev/rules.d/udev.rules
 fi
 udevcontrol reload_rules >/dev/null 2>&1 || true
 udevsettle || true
@@ -169,10 +172,13 @@ 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
 
 # get install device (0x80 BIOS device)
 install_device=$(grep '^(hd0)' "$device_map" | \
@@ -198,7 +204,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
@@ -207,11 +213,9 @@ 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
-root_device=/dev/sda6
-grub_root_device=$(convert_default "$root_device")
 cp_check_and_sed '^# groot=' \
   "s;^# groot=.*;# groot=$grub_root_device;g" \
       "$menu_file" || true
@@ -219,7 +223,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
@@ -244,13 +248,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