From owner-svn-src-all@FreeBSD.ORG  Fri Jun 26 09:32:32 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F2B05106564A;
	Fri, 26 Jun 2009 09:32:31 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E10E38FC0A;
	Fri, 26 Jun 2009 09:32:31 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5Q9WV5O081206;
	Fri, 26 Jun 2009 09:32:31 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5Q9WVK9081205;
	Fri, 26 Jun 2009 09:32:31 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906260932.n5Q9WVK9081205@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 26 Jun 2009 09:32:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195045 - head/sys/boot/i386/libi386
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Jun 2009 09:32:32 -0000

Author: rpaulo
Date: Fri Jun 26 09:32:31 2009
New Revision: 195045
URL: http://svn.freebsd.org/changeset/base/195045

Log:
  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
  MFC after:	2 weeks
  Approved by:	re (kib)

Modified:
  head/sys/boot/i386/libi386/biosdisk.c

Modified: head/sys/boot/i386/libi386/biosdisk.c
==============================================================================
--- head/sys/boot/i386/libi386/biosdisk.c	Fri Jun 26 07:11:14 2009	(r195044)
+++ head/sys/boot/i386/libi386/biosdisk.c	Fri Jun 26 09:32:31 2009	(r195045)
@@ -880,7 +880,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)