X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=a4b757778ac2c97dab98e618306022d37c94cc27;hb=d19c2c3da15c2b8550146e66031fb51938cd125f;hp=79a5a79038bb11e9b0930a30aab473e7c8f7da08;hpb=392974fc96fbad183b29680810f2c6e424cc1deb;p=kernel-cn.git

diff --git a/debian/postinst b/debian/postinst
index 79a5a79..a4b7577 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
 
@@ -154,6 +154,7 @@ 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
+udevsettle || true
 echo -n " udev"
 
 # update device map if possible
@@ -189,6 +190,7 @@ 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\)' \
@@ -208,6 +210,8 @@ fi
 echo -n " grub6"
 
 # 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
@@ -217,9 +221,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