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

diff --git a/debian/postinst b/debian/postinst
index e279cfb..deb7984 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -109,8 +109,12 @@ echo -n " kernel-img.conf"
 # generate initial grub loaders
 if [ ! -d "$grub_dir" ]; then
     mkdir -p "$grub_dir"
+    # x86
     if [ -d /usr/lib/grub/i386-pc ]; then
         cp -a /usr/lib/grub/i386-pc/* "$grub_dir"
+    # x86_64
+    elif [ -d /usr/lib/grub/x86_64-pc ]; then
+        cp -a /usr/lib/grub/x86_64-pc/* "$grub_dir"
     fi
 fi
 echo -n " grub1"
@@ -143,17 +147,17 @@ 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
 
 # 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
-fi
-udevcontrol reload_rules >/dev/null 2>&1 || true
+#if [ ! -e /etc/udev/rules.d/udev.rules ]; then
+#    ln -s ../udev.rules /etc/udev/rules.d/udev.rules
+#fi
+udevadm control --reload_rules >/dev/null 2>&1 || true
 udevsettle || true
 echo -n " udev"
 
@@ -174,6 +178,9 @@ if [ ! -s "$device_map" ]; then
 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 +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