From owner-svn-src-stable@FreeBSD.ORG  Mon Jul 13 16:36:04 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EFD38106566B;
	Mon, 13 Jul 2009 16:36:04 +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 DC3308FC1A;
	Mon, 13 Jul 2009 16:36:04 +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 n6DGa4TS030093;
	Mon, 13 Jul 2009 16:36:04 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6DGa4mT030091;
	Mon, 13 Jul 2009 16:36:04 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200907131636.n6DGa4mT030091@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 13 Jul 2009 16:36:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195657 - in stable/7/sys: . boot/i386/libi386
	contrib/pf geom/label
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jul 2009 16:36:05 -0000

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)