Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-30 22:49:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USETUP] Only check whether the system partition is of recognized type and if not, install FreeLdr on floppy/removable media.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2021-01-31 20:19:19 +01:00
parent 74c0a37e2f
commit 3405cab9dd
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 4 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
base/setup/usetup/usetup.c
View file

@ -3873,8 +3873,6 @@ RegistryPage(PINPUT_RECORD Ir)
static PAGE_NUMBER static PAGE_NUMBER
BootLoaderPage(PINPUT_RECORD Ir) BootLoaderPage(PINPUT_RECORD Ir)
{ {
UCHAR PartitionType;
BOOLEAN InstallOnFloppy;
USHORT Line = 12; USHORT Line = 12;
WCHAR PathBuffer[MAX_PATH]; WCHAR PathBuffer[MAX_PATH];
@ -3891,8 +3889,6 @@ BootLoaderPage(PINPUT_RECORD Ir)
RtlCreateUnicodeString(&USetupData.SystemRootPath, PathBuffer); RtlCreateUnicodeString(&USetupData.SystemRootPath, PathBuffer);
DPRINT1("SystemRootPath: %wZ\n", &USetupData.SystemRootPath); DPRINT1("SystemRootPath: %wZ\n", &USetupData.SystemRootPath);
PartitionType = SystemPartition->PartitionType;
/* For unattended setup, skip MBR installation or install on floppy if needed */ /* For unattended setup, skip MBR installation or install on floppy if needed */
if (IsUnattendedSetup) if (IsUnattendedSetup)
{ {
@ -3905,52 +3901,11 @@ BootLoaderPage(PINPUT_RECORD Ir)
/* /*
* We may install an MBR or VBR, but before that, check whether * We may install an MBR or VBR, but before that, check whether
* we need to actually install the VBR on floppy. * we need to actually install the VBR on floppy/removable media
* if the system partition is not recognized.
*/ */
if (PartitionType == PARTITION_ENTRY_UNUSED) if ((SystemPartition->DiskEntry->DiskStyle != PARTITION_STYLE_MBR) ||
{ !IsRecognizedPartition(SystemPartition->PartitionType))
DPRINT("Error: system partition invalid (unused)\n");
InstallOnFloppy = TRUE;
}
else if (PartitionType == PARTITION_OS2BOOTMGR)
{
/* OS/2 boot manager partition */
DPRINT("Found OS/2 boot manager partition\n");
InstallOnFloppy = TRUE;
}
else if (PartitionType == PARTITION_LINUX)
{
/* Linux partition */
DPRINT("Found Linux native partition (ext2/ext3/ReiserFS/BTRFS/etc)\n");
InstallOnFloppy = FALSE;
}
else if (PartitionType == PARTITION_IFS)
{
/* NTFS partition */
DPRINT("Found NTFS partition\n");
// FIXME: Make it FALSE when we'll support NTFS installation!
InstallOnFloppy = TRUE;
}
else if ((PartitionType == PARTITION_FAT_12) ||
(PartitionType == PARTITION_FAT_16) ||
(PartitionType == PARTITION_HUGE) ||
(PartitionType == PARTITION_XINT13) ||
(PartitionType == PARTITION_FAT32) ||
(PartitionType == PARTITION_FAT32_XINT13))
{
DPRINT("Found FAT partition\n");
InstallOnFloppy = FALSE;
}
else
{
/* Unknown partition */
DPRINT("Unknown partition found\n");
InstallOnFloppy = TRUE;
}
/* We should install on floppy */
if (InstallOnFloppy)
{ {
USetupData.MBRInstallType = 1; USetupData.MBRInstallType = 1;
goto Quit; goto Quit;