Author: hbelusca
Date: Tue Jun 6 23:44:56 2017
New Revision: 74932
URL:
http://svn.reactos.org/svn/reactos?rev=74932&view=rev
Log:
[USETUP]: When installing new FreeLDR entries for recognized DOS/OS-2 boot loaders, use
distinct OS section names. Also, add detection for the Dell Real-Mode Kernel OS (DRMK).
Modified:
branches/setup_improvements/base/setup/usetup/bootsup.c
Modified: branches/setup_improvements/base/setup/usetup/bootsup.c
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u…
==============================================================================
--- branches/setup_improvements/base/setup/usetup/bootsup.c [iso-8859-1] (original)
+++ branches/setup_improvements/base/setup/usetup/bootsup.c [iso-8859-1] Tue Jun 6
23:44:56 2017
@@ -2208,7 +2208,7 @@
{
DPRINT1("Found COMPAQ MS-DOS 1.x (1.11, 1.12) / MS-DOS 1.25 boot
loader\n");
- Section = L"DOS";
+ Section = L"CPQDOS";
Description = L"\"COMPAQ MS-DOS 1.x / MS-DOS 1.25\"";
BootDrive = L"hd0";
BootPartition = L"1";
@@ -2222,7 +2222,7 @@
{
DPRINT1("Found Microsoft DOS or Windows 9x boot loader\n");
- Section = L"DOS";
+ Section = L"MSDOS";
Description = L"\"MS-DOS/Windows\"";
BootDrive = L"hd0";
BootPartition = L"1";
@@ -2236,7 +2236,7 @@
{
DPRINT1("Found IBM PC-DOS or DR-DOS 5.x or IBM OS/2 1.0\n");
- Section = L"DOS";
+ Section = L"IBMDOS";
Description = L"\"IBM PC-DOS or DR-DOS 5.x or IBM OS/2
1.0\"";
BootDrive = L"hd0";
BootPartition = L"1";
@@ -2249,8 +2249,21 @@
{
DPRINT1("Found DR-DOS 3.x\n");
- Section = L"DOS";
+ Section = L"DRDOS";
Description = L"\"DR-DOS 3.x\"";
+ BootDrive = L"hd0";
+ BootPartition = L"1";
+ BootSector = L"BOOTSECT.DOS";
+ }
+ else
+ /* Search for Dell Real-Mode Kernel (DRMK) OS */
+ if (DoesFileExist_2(SystemRootPath->Buffer, L"DELLBIO.BIN") == TRUE
||
+ DoesFileExist_2(SystemRootPath->Buffer, L"DELLRMK.BIN") ==
TRUE)
+ {
+ DPRINT1("Found Dell Real-Mode Kernel OS\n");
+
+ Section = L"DRMK";
+ Description = L"\"Dell Real-Mode Kernel OS\"";
BootDrive = L"hd0";
BootPartition = L"1";
BootSector = L"BOOTSECT.DOS";
@@ -2263,7 +2276,7 @@
{
DPRINT1("Found MS OS/2 1.x\n");
- Section = L"DOS";
+ Section = L"MSOS2";
Description = L"\"MS OS/2 1.x\"";
BootDrive = L"hd0";
BootPartition = L"1";
@@ -2277,7 +2290,7 @@
{
DPRINT1("Found MS/IBM OS/2\n");
- Section = L"DOS";
+ Section = L"IBMOS2";
Description = L"\"MS/IBM OS/2\"";
BootDrive = L"hd0";
BootPartition = L"1";
@@ -2289,7 +2302,7 @@
{
DPRINT1("Found FreeDOS boot loader\n");
- Section = L"DOS";
+ Section = L"FDOS";
Description = L"\"FreeDOS\"";
BootDrive = L"hd0";
BootPartition = L"1";