- Fix the ordering of disks in the 1st stage setup list
- Search for the active partition on the selected install disk instead of the first disk

svn path=/branches/usb-bringup-trunk/; revision=55299
This commit is contained in:
Cameron Gutman 2012-01-29 22:54:57 +00:00
parent a4c2608e34
commit d5f187d853

View file

@ -875,7 +875,7 @@ AddDiskToList (HANDLE FileHandle,
GetDriverName (DiskEntry);
InsertAscendingList(&List->DiskListHead, DiskEntry, DISKENTRY, ListEntry, BiosDiskNumber);
InsertAscendingList(&List->DiskListHead, DiskEntry, DISKENTRY, ListEntry, DiskNumber);
/*
* Allocate a buffer for 26 logical drives (2 entries each == 52)
@ -2377,9 +2377,8 @@ CheckActiveBootPartition (PPARTLIST List)
}
#endif
DiskEntry = CONTAINING_RECORD (List->DiskListHead.Flink,
DISKENTRY,
ListEntry);
/* Choose the currently selected disk */
DiskEntry = List->CurrentDisk;
/* Check for empty partition list */
if (IsListEmpty (&DiskEntry->PartListHead))
@ -2440,7 +2439,7 @@ CheckActiveBootPartition (PPARTLIST List)
List->ActiveBootPartitionNumber = i;
DPRINT("Found bootable partition disk %d, drive letter %c\n",
DiskEntry->BiosDiskNumber, PartEntry->DriveLetter[i]);
DiskEntry->DiskNumber, PartEntry->DriveLetter[i]);
break;
}