From 505b3c9b74f0dd406bb2c8e3f1f6dd58dd40f356 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jun 2012 01:09:36 +0200
Subject: [PATCH] 	* util/grub-install.in: Fix cross-disk check on
 non-PreP machines.

---
 ChangeLog            | 4 ++++
 util/grub-install.in | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 32edd650a..1f9107af0 100644
--- 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 083d266bf..0697c47c5 100644
--- 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=