* util/grub-install.in: Declare IEEE1275 as able to find out the disk

	name.

diff --git a/ChangeLog b/ChangeLog
index 6210a4eaba28ae227350620b358e64e48f3ce97e..afbc8aec7eb137091707579a26cc1ce106b1d4db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-install.in: Declare IEEE1275 as able to find out the disk
+       name.
+
 2011-10-19  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/main.c (grub_set_prefix_and_root): Init prefix.

diff --git a/util/grub-install.in b/util/grub-install.in
index d11d24421077d57bc18ddeeeaf18f323fad656bf..e1255f4f76238f4cb36fbfd7a2f296bfecf78eb6 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -544,11 +544,11 @@ if [ "x${devabstraction_module}" = "x" ] ; then
     # Strip partition number
     grub_partition="`echo "${grub_drive}" | sed -e 's/^[^,]*[,)]//; s/)$//'`"
     grub_drive="`echo "${grub_drive}" | sed -e s/,[a-z0-9,]*//g`"
-    if ([ "x$disk_module" != x ] && [ "x$disk_module" != xbiosdisk ]) || [ "x${grub_drive}" != "x${install_drive}" ] || ([ "x$platform" != xefi ] && [ "x$platform" != xpc ] && [ x"${target_cpu}-${platform}" != x"sparc64-ieee1275" ]); then
+    if ([ "x$disk_module" != x ] && [ "x$disk_module" != xbiosdisk ]) || [ "x${grub_drive}" != "x${install_drive}" ] || ([ "x$platform" != xefi ] && [ "x$platform" != xpc ] && [ x"${platform}" != x"ieee1275" ]); then
         # generic method (used on coreboot and ata mod)
         uuid="`"$grub_probe" --device-map="${device_map}" --target=fs_uuid --device "${grub_device}"`"
         if [ "x${uuid}" = "x" ] ; then
-          if [ "x$platform" != xefi ] && [ "x$platform" != xpc ] && [ x"${target_cpu}-${platform}" != x"sparc64-ieee1275" ]; then
+          if [ "x$platform" != xefi ] && [ "x$platform" != xpc ] && [ x"${platform}" != x"ieee1275" ]; then
              echo "UUID needed with $platform, but the filesystem containing ${grubdir} does not support UUIDs." 1>&2
           elif [ "$disk_module" = ata ]; then
              echo "UUID needed with ata mod, but the filesystem containing ${grubdir} does not support UUIDs." 1>&2
@@ -563,7 +563,7 @@ if [ "x${devabstraction_module}" = "x" ] ; then
        echo 'set prefix=($root)'"${relative_grubdir}" >> "${grubdir}/load.cfg"
        config_opt="-c ${grubdir}/load.cfg "
         modules="$modules search_fs_uuid"
-    elif [ "x$platform" = xefi ] || [ "x$platform" = xpc ]; then
+    elif [ "x$platform" = xefi ] || [ "x$platform" = xpc ] || [ "x$platform" = xieee1275 ]; then
         # we need to hardcode the partition number in the core image's prefix.
        if [ x"$grub_partition" = x ]; then
             prefix_drive="()"