- fix :q! koji se provukao...

[kernel-cn.git] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index b413e81..093c613 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -147,7 +147,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
 
@@ -157,7 +157,7 @@ rm -f /etc/udev/rules.d/devfs.rules /etc/udev/rules.d/compat.rules \
 #if [ ! -e /etc/udev/rules.d/udev.rules ]; then
 #    ln -s ../udev.rules /etc/udev/rules.d/udev.rules
 #fi
-udevcontrol reload_rules >/dev/null 2>&1 || true
+udevadm control --reload_rules >/dev/null 2>&1 || true
 udevsettle || true
 echo -n " udev"
 
@@ -173,11 +173,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%')
@@ -250,7 +253,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