* util/grub-install.in: Fix cross-disk check on non-PreP machines.

diff --git a/ChangeLog b/ChangeLog
index 32edd650a85e1d8f410a9afdd58b2ca6b7e831d9..1f9107af0c2068bdc26be33063e1e18a1a3865e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-install.in: Fix cross-disk check on non-PreP machines.
+
 2012-06-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/term/ieee1275/console.c (grub_console_fini): Don't

diff --git a/util/grub-install.in b/util/grub-install.in
index 083d266bfdc5288b2b7c87020a12e6404411eb4c..0697c47c54a0152ee432f2ec3ee87d7dd05854c6 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -641,6 +641,11 @@ if [ "x${devabstraction_module}" = "x" ] ; then
     # Strip partition number
     grub_partition="`echo "${grub_drive}" | sed -e 's/^(\(\([^,\\\\]\|\\\\\\\\\|\\\\,\)*\)\(\(,[a-zA-Z0-9]*\)*\))$/\3/'`"
     grub_drive="`echo "${grub_drive}" | sed -e 's/^(\(\([^,\\\\]\|\\\\\\\\\|\\\\,\)*\)\(\(,[a-zA-Z0-9]*\)*\))$/\1/'`"
+
+    if [ x"${install_device}" = x ] && [ x"${grub_modinfo_target_cpu}-$grub_modinfo_platform" = x"powerpc-ieee1275" ]; then
+       install_drive="$grub_drive"
+    fi
+
     if ([ "x$disk_module" != x ] && [ "x$disk_module" != xbiosdisk ]) || [ "x${grub_drive}" != "x${install_drive}" ] || ([ "x$grub_modinfo_platform" != xefi ] && [ "x$grub_modinfo_platform" != xpc ] && [ x"${grub_modinfo_platform}" != x"ieee1275" ]); then
         # generic method (used on coreboot and ata mod)
        uuid=