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

diff --git a/debian/postinst b/debian/postinst
index 45f8046..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,18 @@ 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"
 
 # update device map if possible
@@ -167,11 +172,15 @@ if [ ! -s "$device_map" ]; then
     if [ -f "$device_map.old" ]; then
         mv -f "$device_map.old" "$device_map"
     fi
-else
+
+:q!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%')
@@ -188,10 +197,11 @@ if [ -h "$install_device" ]; then
     if [ -z "$install_device_resolved" ]; then
         install_device_resolved="$install_device"
     fi
+
     # try to fix device map with symlink resolved device
     if [ "x$install_device_resolved" != "x$install_device" ]; then
-        cp_check_and_sed '^(hd0)' \
-            "s;^(hd0).*;(hd0)	$install_device_resolved" "$device_map" \
+        cp_check_and_sed '^\(hd0\)' \
+            "s;^(hd0).*;(hd0)	$install_device_resolved;" "$device_map" \
             || true
     fi
 fi
@@ -216,9 +226,34 @@ cp_check_and_sed '^# kopt=' \
 /usr/sbin/update-grub >/dev/null 2>&1 || true
 echo -n " grub7"
 
+# and final stage of devfs/udev brokeness fix
+if [ "x$install_device_resolved" != "x$install_device" ]; then
+    # get original (symlinked device)
+    root_device=$(find_device_nonresolved "/")
+    if [ -z "$root_device" ]; then
+        root_device=$(find_root_device)
+    fi
+
+    # fix (hd0) mapping
+    cp_check_and_sed '^\(hd0\)' \
+        "s;^(hd0).*;(hd0)	$install_device;" "$device_map" \
+        || true
+
+    # fix global root= invocation
+    cp_check_and_sed '^# kopt=' \
+      "s;^# kopt=\(.*\)root=[^[:space:]]*\(.*\);# kopt=\1root=$root_device\2;g" \
+          "$menu_file" || true
+
+    # fix root= invocation for individual kernel profiles
+    cp_check_and_sed '^kernel' \
+      "s;\(^kernel.*\)root=[^[:space:]]*\(.*\);\1root=$root_device\2;g" \
+          "$menu_file" || true
+fi
+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