X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=ce9b5d6fd7edc88ae91dcd498854aca4a217a77c;hb=e5c46f37624fbd8c6e7fb400e2f2019af3431c11;hp=e279cfb359f94122c478c72acc26e9d01349585e;hpb=8ac8a961503537d2753d9a163834a8108b871880;p=kernel-cn.git

diff --git a/debian/postinst b/debian/postinst
index e279cfb..ce9b5d6 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -143,7 +143,7 @@ echo -n " grub3"
 # workaround execshield
 SHIELD=$(sysctl -e -n kernel.exec-shield)
 if [ ! -z "$SHIELD" ]; then
-    sysctl -w -e kernel.exec-shield=0 >/dev/null 2>&1
+    sysctl -e -w kernel.exec-shield=0 >/dev/null 2>&1
     echo -n " execshield1"
 fi
 
@@ -169,11 +169,14 @@ 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"
 
+# 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" | \
     sed -e 's%[^[:space:]]*[[:space:]]*\([^[:space:]]*\)%\1%')
@@ -246,7 +249,7 @@ echo -n " grub8"
 
 # restore execshield state
 if [ ! -z "$SHIELD" ]; then
-    sysctl -w -e "kernel.exec-shield=$SHIELD" >/dev/null 2>&1
+    sysctl -e -w "kernel.exec-shield=$SHIELD" >/dev/null 2>&1
     echo -n " execshield2"
 fi