svn commit: r195657 - in stable/7/sys: . boot/i386/libi386
contrib/pf geom/label
Rui Paulo
rpaulo at FreeBSD.org
Mon Jul 13 16:36:05 UTC 2009
Author: rpaulo
Date: Mon Jul 13 16:36:04 2009
New Revision: 195657
URL: http://svn.freebsd.org/changeset/base/195657
Log:
MFC r195045:
On special systems where the MBR and the GPT are in sync (up to the 4th
slicei, Apple EFI hardware), the bootloader will fail to recognize the GPT
if it finds anything else but the EFI partition. Change the check to continue
detecting the GPT by looking at the EFI partition on the MBR but
stopping successfuly after finding it.
PR: kern/134590
Submitted by: Christoph Langguth <christoph at rosenkeller.org>
Reviewed by: jhb
Modified:
stable/7/sys/ (props changed)
stable/7/sys/boot/i386/libi386/biosdisk.c
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/geom/label/ (props changed)
stable/7/sys/geom/label/g_label.c (props changed)
Modified: stable/7/sys/boot/i386/libi386/biosdisk.c
==============================================================================
--- stable/7/sys/boot/i386/libi386/biosdisk.c Mon Jul 13 12:53:43 2009 (r195656)
+++ stable/7/sys/boot/i386/libi386/biosdisk.c Mon Jul 13 16:36:04 2009 (r195657)
@@ -888,7 +888,7 @@ bd_open_gpt(struct open_disk *od, struct
for (i = 0; i < NDOSPART; i++) {
if (dp[i].dp_typ == 0xee)
part++;
- else if (dp[i].dp_typ != 0x00)
+ else if ((part != 1) && (dp[i].dp_typ != 0x00))
return (EINVAL);
}
if (part != 1)
More information about the svn-src-all
mailing list