Date: Mon, 13 Jul 2009 16:36:04 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r195657 - in stable/7/sys: . boot/i386/libi386 contrib/pf geom/label Message-ID: <200907131636.n6DGa4mT030091@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907131636.n6DGa4mT030091>