Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion grub-core/disk/mdraid1x_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ grub_mdraid_detect (grub_disk_t disk,
struct grub_diskfilter_vg *array;
char *uuid;

#ifdef __powerpc__
#if defined(__powerpc__) && !defined(GRUB_UTIL)
/* Firmware will yell at us for reading too far. */
if (minor_version == 0)
continue;
Expand Down
2 changes: 1 addition & 1 deletion grub-core/disk/mdraid_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ grub_mdraid_detect (grub_disk_t disk,
grub_uint32_t level;
struct grub_diskfilter_vg *ret;

#ifdef __powerpc__
#if defined(__powerpc__) && !defined(GRUB_UTIL)
/* Firmware will yell at us for reading too far. */
return NULL;
#endif
Expand Down
7 changes: 6 additions & 1 deletion util/grub-install.c
Original file line number Diff line number Diff line change
Expand Up @@ -1422,7 +1422,12 @@ main (int argc, char *argv[])
debug_image);
}

if (!have_abstractions)
int is_ieee1275_raid1 = have_abstractions
&& (platform == GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275)
&& grub_dev->disk
&& probe_raid_level (grub_dev->disk) == 1;

if (!have_abstractions || is_ieee1275_raid1)
{
if ((disk_module && grub_strcmp (disk_module, "biosdisk") != 0)
|| grub_drives[1]
Expand Down