From 3cb1392effab614f88b9d044fc09b231aeea8dcd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Tue, 6 Jun 2017 23:44:56 +0000 Subject: [PATCH] [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). svn path=/branches/setup_improvements/; revision=74932 --- base/setup/usetup/bootsup.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/base/setup/usetup/bootsup.c b/base/setup/usetup/bootsup.c index 71d0392af94..469693b56ae 100644 --- a/base/setup/usetup/bootsup.c +++ b/base/setup/usetup/bootsup.c @@ -2235,7 +2235,7 @@ InstallFatBootcodeToPartition( { 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"; @@ -2249,7 +2249,7 @@ InstallFatBootcodeToPartition( { 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"; @@ -2263,7 +2263,7 @@ InstallFatBootcodeToPartition( { 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"; @@ -2276,13 +2276,26 @@ InstallFatBootcodeToPartition( { 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"; + } + else /* Search for MS OS/2 1.x */ if (DoesFileExist_2(SystemRootPath->Buffer, L"OS2BOOT.COM") == TRUE || DoesFileExist_2(SystemRootPath->Buffer, L"OS2BIO.COM" ) == TRUE || @@ -2290,7 +2303,7 @@ InstallFatBootcodeToPartition( { 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"; @@ -2304,7 +2317,7 @@ InstallFatBootcodeToPartition( { 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"; @@ -2316,7 +2329,7 @@ InstallFatBootcodeToPartition( { DPRINT1("Found FreeDOS boot loader\n"); - Section = L"DOS"; + Section = L"FDOS"; Description = L"\"FreeDOS\""; BootDrive = L"hd0"; BootPartition = L"1"; -- 2.17.1