90c90,100
<       /* Analyze DOS partitions.  */
---
>       /* First pass to find GPT partitions.  */
>       for (p.index = 0; p.index < 4; p.index++)
> 	{
> 	  e = mbr.entries + p.index;
> 
> 	  /* If this is a GPT partition, this MBR is just a dummy.  */
> 	  if (e->type == GRUB_PC_PARTITION_TYPE_GPT_DISK)
> 	    return grub_error (GRUB_ERR_BAD_PART_TABLE, "dummy mbr");
> 	}
> 
>       /* Second pass to analyze DOS partitions.  */
105,108d114
< 	  /* If this is a GPT partition, this MBR is just a dummy.  */
< 	  if (e->type == GRUB_PC_PARTITION_TYPE_GPT_DISK && p.index == 0)
< 	    return grub_error (GRUB_ERR_BAD_PART_TABLE, "dummy mbr");
< 
213c219
< 	  if (e->type == GRUB_PC_PARTITION_TYPE_GPT_DISK && i == 0)
---
> 	  if (e->type == GRUB_PC_PARTITION_TYPE_GPT_DISK)