ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Maciej Bialas <[email protected]>

Browse Source 
- Don't check boot partition during unattended setup if MBR installation is skipped anyway.

svn path=/trunk/; revision=41989
This commit is contained in:
Aleksey Bragin
2009-07-16 09:09:26 +00:00
parent fe5c1a52ce
commit c825c5dc02
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/base/setup/usetup/interface/usetup.c
+15 -13
View File
@@ -3353,6 +3353,18 @@ BootLoaderPage(PINPUT_RECORD Ir)
PartitionType = PartitionList->ActiveBootPartition->
PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionType;
if (IsUnattendedSetup)
{
if (UnattendMBRInstallType == 0) /* skip MBR installation */
{
return SUCCESS_PAGE;
}
else if (UnattendMBRInstallType == 1) /* install on floppy */
{
return BOOT_LOADER_FLOPPY_PAGE;
}
}
if (PartitionType == PARTITION_ENTRY_UNUSED)
{
DPRINT("Error: active partition invalid (unused)\n");
@@ -3398,20 +3410,10 @@ BootLoaderPage(PINPUT_RECORD Ir)
return BOOT_LOADER_FLOPPY_PAGE;
}
if (IsUnattendedSetup)
/* Unattended install on hdd? */
if (IsUnattendedSetup && UnattendMBRInstallType == 2)
{
if (UnattendMBRInstallType == 0) /* skip MBR installation */
{
return SUCCESS_PAGE;
}
else if (UnattendMBRInstallType == 1) /* install on floppy */
{
return BOOT_LOADER_FLOPPY_PAGE;
}
else if (UnattendMBRInstallType == 2) /* install on hdd */
{
return BOOT_LOADER_HARDDISK_PAGE;
}
return BOOT_LOADER_HARDDISK_PAGE;
}
MUIDisplayPage(BOOT_LOADER_PAGE);