d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r263468:

Browse Source 
When loader(8) inspects MBR, it chooses GPT as main partition table,
  when MBR contains only PMBR entry or it is bootcamp-compatible.
  If MBR has PMBR entry and some other, the loader rejects it.

  Make these checks to be less strict. If loader decided that PMBR
  isn't suitable for GPT, it will use MBR.

  Reported by:	Paul Thornton
This commit is contained in:
ae 2014-03-31 09:34:46 +00:00
parent b357774f50
commit ed08ddc2a1
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/boot/common/part.c
View File

@ -634,7 +634,7 @@ ptable_open(void *dev, off_t sectors, uint16_t sectorsize,
for (i = 0, count = 0; i < NDOSPART; i++) {
if (dp[i].dp_flag != 0 && dp[i].dp_flag != 0x80) {
DEBUG("invalid partition flag %x", dp[i].dp_flag);
break;
goto out;
}
#ifdef LOADER_GPT_SUPPORT
if (dp[i].dp_typ == DOSPTYP_PMBR) {
@ -646,15 +646,12 @@ ptable_open(void *dev, off_t sectors, uint16_t sectorsize,
count++;
}
/* Do we have some invalid values? */
if (i != NDOSPART ||
(table->type == PTABLE_GPT && count > 1)) {
if (table->type == PTABLE_GPT && count > 1) {
if (dp[1].dp_typ != DOSPTYP_HFS) {
table->type = PTABLE_NONE;
DEBUG("invalid values detected, ignore "
"partition table");
goto out;
}
DEBUG("Bootcamp detected");
DEBUG("Incorrect PMBR, ignore it");
} else
DEBUG("Bootcamp detected");
}
#ifdef LOADER_GPT_SUPPORT
if (table->type == PTABLE_GPT) {