# 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
+#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
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\)' \
/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