From 38a87f0176c2363d39138139386561e56408ffdd Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 5 Sep 2010 17:09:18 +0000 Subject: [PATCH] [USETUP] - Add the option to write only the VBR so FreeLoader can easily be chain loaded by GRUB or another boot loader - Dedicated to James Tabor :) svn path=/trunk/; revision=48703 --- reactos/base/setup/usetup/bootsup.c | 22 ++++++ reactos/base/setup/usetup/bootsup.h | 6 ++ reactos/base/setup/usetup/interface/usetup.c | 73 ++++++++++++-------- reactos/base/setup/usetup/lang/bg-BG.h | 10 ++- reactos/base/setup/usetup/lang/cs-CZ.h | 10 ++- reactos/base/setup/usetup/lang/de-DE.h | 10 ++- reactos/base/setup/usetup/lang/el-GR.h | 10 ++- reactos/base/setup/usetup/lang/en-US.h | 10 ++- reactos/base/setup/usetup/lang/es-ES.h | 10 ++- reactos/base/setup/usetup/lang/et-EE.h | 10 ++- reactos/base/setup/usetup/lang/fr-FR.h | 10 ++- reactos/base/setup/usetup/lang/it-IT.h | 10 ++- reactos/base/setup/usetup/lang/ja-JP.h | 10 ++- reactos/base/setup/usetup/lang/lt-LT.h | 10 ++- reactos/base/setup/usetup/lang/nl-NL.h | 10 ++- reactos/base/setup/usetup/lang/pl-PL.h | 10 ++- reactos/base/setup/usetup/lang/ru-RU.h | 10 ++- reactos/base/setup/usetup/lang/sk-SK.h | 10 ++- reactos/base/setup/usetup/lang/sv-SE.h | 10 ++- reactos/base/setup/usetup/lang/uk-UA.h | 10 ++- reactos/base/setup/usetup/usetup.h | 3 +- 21 files changed, 211 insertions(+), 63 deletions(-) diff --git a/reactos/base/setup/usetup/bootsup.c b/reactos/base/setup/usetup/bootsup.c index 7abbcb1f4a0..780d96a2e99 100644 --- a/reactos/base/setup/usetup/bootsup.c +++ b/reactos/base/setup/usetup/bootsup.c @@ -2156,6 +2156,28 @@ InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath, #endif } +NTSTATUS +InstallVBRToPartition(PUNICODE_STRING SystemRootPath, + PUNICODE_STRING SourceRootPath, + PUNICODE_STRING DestinationArcPath, + UCHAR PartitionType) +{ + if ((PartitionType == PARTITION_FAT_12) || + (PartitionType == PARTITION_FAT_16) || + (PartitionType == PARTITION_HUGE) || + (PartitionType == PARTITION_XINT13) || + (PartitionType == PARTITION_FAT32) || + (PartitionType == PARTITION_FAT32_XINT13)) + { + return InstallFatBootcodeToPartition(SystemRootPath, + SourceRootPath, + DestinationArcPath, + PartitionType); + } + + return STATUS_UNSUCCESSFUL; +} + NTSTATUS InstallFatBootcodeToFloppy(PUNICODE_STRING SourceRootPath, diff --git a/reactos/base/setup/usetup/bootsup.h b/reactos/base/setup/usetup/bootsup.h index a0b012ed32b..75c772a2140 100644 --- a/reactos/base/setup/usetup/bootsup.h +++ b/reactos/base/setup/usetup/bootsup.h @@ -78,6 +78,12 @@ InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath, PUNICODE_STRING DestinationArcPath, UCHAR PartitionType); +NTSTATUS +InstallVBRToPartition(PUNICODE_STRING SystemRootPath, + PUNICODE_STRING SourceRootPath, + PUNICODE_STRING DestinationArcPath, + UCHAR PartitionType); + NTSTATUS InstallFatBootcodeToFloppy(PUNICODE_STRING SourceRootPath, PUNICODE_STRING DestinationArcPath); diff --git a/reactos/base/setup/usetup/interface/usetup.c b/reactos/base/setup/usetup/interface/usetup.c index 5b5b6ea78e8..2faad50456b 100644 --- a/reactos/base/setup/usetup/interface/usetup.c +++ b/reactos/base/setup/usetup/interface/usetup.c @@ -3480,7 +3480,7 @@ BootLoaderPage(PINPUT_RECORD Ir) /* Unattended install on hdd? */ if (IsUnattendedSetup && UnattendMBRInstallType == 2) { - return BOOT_LOADER_HARDDISK_PAGE; + return BOOT_LOADER_HARDDISK_MBR_PAGE; } MUIDisplayPage(BOOT_LOADER_PAGE); @@ -3497,9 +3497,9 @@ BootLoaderPage(PINPUT_RECORD Ir) Line++; if (Line<12) - Line=14; + Line=15; - if (Line>14) + if (Line>15) Line=12; CONSOLE_InvertTextXY(8, Line, 60, 1); @@ -3511,9 +3511,9 @@ BootLoaderPage(PINPUT_RECORD Ir) Line--; if (Line<12) - Line=14; + Line=15; - if (Line>14) + if (Line>15) Line=12; CONSOLE_InvertTextXY(8, Line, 60, 1); @@ -3530,13 +3530,17 @@ BootLoaderPage(PINPUT_RECORD Ir) { if (Line == 12) { - return BOOT_LOADER_HARDDISK_PAGE; + return BOOT_LOADER_HARDDISK_MBR_PAGE; } else if (Line == 13) { - return BOOT_LOADER_FLOPPY_PAGE; + return BOOT_LOADER_HARDDISK_VBR_PAGE; } else if (Line == 14) + { + return BOOT_LOADER_FLOPPY_PAGE; + } + else if (Line == 15) { return SUCCESS_PAGE; } @@ -3592,9 +3596,30 @@ BootLoaderFloppyPage(PINPUT_RECORD Ir) return BOOT_LOADER_FLOPPY_PAGE; } +static PAGE_NUMBER +BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir) +{ + UCHAR PartitionType; + NTSTATUS Status; + + PartitionType = PartitionList->ActiveBootPartition-> + PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionType; + + Status = InstallVBRToPartition(&SystemRootPath, + &SourceRootPath, + &DestinationArcPath, + PartitionType); + if (!NT_SUCCESS(Status)) + { + MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + + return SUCCESS_PAGE; +} static PAGE_NUMBER -BootLoaderHarddiskPage(PINPUT_RECORD Ir) +BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) { UCHAR PartitionType; NTSTATUS Status; @@ -3604,24 +3629,12 @@ BootLoaderHarddiskPage(PINPUT_RECORD Ir) /* Step 1: Write the VBR */ PartitionType = PartitionList->ActiveBootPartition-> PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionType; - if ((PartitionType == PARTITION_FAT_12) || - (PartitionType == PARTITION_FAT_16) || - (PartitionType == PARTITION_HUGE) || - (PartitionType == PARTITION_XINT13) || - (PartitionType == PARTITION_FAT32) || - (PartitionType == PARTITION_FAT32_XINT13)) - { - Status = InstallFatBootcodeToPartition(&SystemRootPath, - &SourceRootPath, - &DestinationArcPath, - PartitionType); - if (!NT_SUCCESS(Status)) - { - MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - } - else + + Status = InstallVBRToPartition(&SystemRootPath, + &SourceRootPath, + &DestinationArcPath, + PartitionType); + if (!NT_SUCCESS(Status)) { MUIDisplayError(ERROR_WRITE_BOOT, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; @@ -3915,8 +3928,12 @@ RunUSetup(VOID) Page = BootLoaderFloppyPage(&Ir); break; - case BOOT_LOADER_HARDDISK_PAGE: - Page = BootLoaderHarddiskPage(&Ir); + case BOOT_LOADER_HARDDISK_MBR_PAGE: + Page = BootLoaderHarddiskMbrPage(&Ir); + break; + + case BOOT_LOADER_HARDDISK_VBR_PAGE: + Page = BootLoaderHarddiskVbrPage(&Ir); break; /* Repair pages */ diff --git a/reactos/base/setup/usetup/lang/bg-BG.h b/reactos/base/setup/usetup/lang/bg-BG.h index b6b22fdbf13..9e8de240a6a 100644 --- a/reactos/base/setup/usetup/lang/bg-BG.h +++ b/reactos/base/setup/usetup/lang/bg-BG.h @@ -995,18 +995,24 @@ static MUI_ENTRY bgBGBootLoaderEntries[] = { 8, 12, - "‘« £ ­¥ ­  § à¥¦¤ ç ­  â¢êà¤¨ï ¤¨áª (¢ MBR).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "‘« £ ­¥ ­  § à¥¦¤ ç ­  ¤¨áª¥â .", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + "‘« £ ­¥ ­  § à¥¦¤ ç ­  ¤¨áª¥â .", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, "„  ­¥ ᥠ᫠£  § à¥¦¤ ç.", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/lang/cs-CZ.h b/reactos/base/setup/usetup/lang/cs-CZ.h index 428b0f55fea..523cca70c2d 100644 --- a/reactos/base/setup/usetup/lang/cs-CZ.h +++ b/reactos/base/setup/usetup/lang/cs-CZ.h @@ -993,18 +993,24 @@ static MUI_ENTRY csCZBootLoaderEntries[] = { 8, 12, - "Nainstalovat zavadØŸ na disk (MBR).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Nainstalovat zavadØŸ na disketu.", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + "Nainstalovat zavadØŸ na disketu.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, "PýeskoŸit instalaci zavadØŸe.", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/lang/de-DE.h b/reactos/base/setup/usetup/lang/de-DE.h index 4686873427a..3a5937240a8 100644 --- a/reactos/base/setup/usetup/lang/de-DE.h +++ b/reactos/base/setup/usetup/lang/de-DE.h @@ -986,18 +986,24 @@ static MUI_ENTRY deDEBootLoaderEntries[] = { 8, 12, - "Boot-Loader auf der Festplatte installieren (Bootsektor).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Boot-Loader auf einer Diskette installieren.", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + "Boot-Loader auf einer Diskette installieren.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, "Boot-Loader nicht installieren.", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/lang/el-GR.h b/reactos/base/setup/usetup/lang/el-GR.h index 66de19aa71a..16fc2d3f57d 100644 --- a/reactos/base/setup/usetup/lang/el-GR.h +++ b/reactos/base/setup/usetup/lang/el-GR.h @@ -1009,18 +1009,24 @@ static MUI_ENTRY elGRBootLoaderEntries[] = { 8, 12, - "„š¡˜«á©«˜©ž «¦¬ bootloader ©«¦ ©¡¢ž¨æ ›å©¡¦ (MBR).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "„š¡˜«á©«˜©ž «¦¬ bootloader ©œ £ ˜ › ©¡â«˜.", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + "„š¡˜«á©«˜©ž «¦¬ bootloader ©œ £ ˜ › ©¡â«˜.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, "Œ˜ £ž šå¤œ  œš¡˜«á©«˜©ž «¦¬ bootloader.", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/lang/en-US.h b/reactos/base/setup/usetup/lang/en-US.h index 9038002050d..909552f277d 100644 --- a/reactos/base/setup/usetup/lang/en-US.h +++ b/reactos/base/setup/usetup/lang/en-US.h @@ -985,18 +985,24 @@ static MUI_ENTRY enUSBootLoaderEntries[] = { 8, 12, - "Install bootloader on the harddisk (bootsector).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on a floppy disk.", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + "Install bootloader on a floppy disk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, "Skip install bootloader.", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/lang/es-ES.h b/reactos/base/setup/usetup/lang/es-ES.h index bc2fe1340af..1df39349954 100644 --- a/reactos/base/setup/usetup/lang/es-ES.h +++ b/reactos/base/setup/usetup/lang/es-ES.h @@ -992,18 +992,24 @@ static MUI_ENTRY esESBootLoaderEntries[] = { 8, 12, - "Instalar cargador de arranque en el disco duro (sector de boot).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Instalar cargador de inicio en un disquete.", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + "Instalar cargador de inicio en un disquete.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, "Omitir la instalaci¢n del cargador de arranque.", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/lang/et-EE.h b/reactos/base/setup/usetup/lang/et-EE.h index f0b7e8bd328..3c8a14b43c5 100644 --- a/reactos/base/setup/usetup/lang/et-EE.h +++ b/reactos/base/setup/usetup/lang/et-EE.h @@ -985,18 +985,24 @@ static MUI_ENTRY etEEBootLoaderEntries[] = { 8, 12, - "Paigalda alglaadur kävakettale (MBR).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Paigalda alglaadur flopikettale.", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + "Paigalda alglaadur flopikettale.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, "Žra paigalda alglaadurit.", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/lang/fr-FR.h b/reactos/base/setup/usetup/lang/fr-FR.h index aa3b3df809a..c9607c965f3 100644 --- a/reactos/base/setup/usetup/lang/fr-FR.h +++ b/reactos/base/setup/usetup/lang/fr-FR.h @@ -998,18 +998,24 @@ static MUI_ENTRY frFRBootLoaderEntries[] = { 8, 12, - "Installer le chargeur de d‚marrage sur le disque dur (MBR).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Installer le chargeur de d‚marrage sur une disquette.", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + "Installer le chargeur de d‚marrage sur une disquette.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, "Ne pas installer le chargeur de d‚marrage.", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/lang/it-IT.h b/reactos/base/setup/usetup/lang/it-IT.h index 3b4ac5670cd..6e3c4d88398 100644 --- a/reactos/base/setup/usetup/lang/it-IT.h +++ b/reactos/base/setup/usetup/lang/it-IT.h @@ -986,18 +986,24 @@ static MUI_ENTRY itITBootLoaderEntries[] = { 8, 12, - "Installazione del bootloader sul disco fisso (settore di avvio).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Installazione del bootloader su un disco floppy.", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + "Installazione del bootloader su un disco floppy.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, "Salta l'installazione del bootloader.", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/lang/ja-JP.h b/reactos/base/setup/usetup/lang/ja-JP.h index 03b6ec1841d..0db36acab83 100644 --- a/reactos/base/setup/usetup/lang/ja-JP.h +++ b/reactos/base/setup/usetup/lang/ja-JP.h @@ -986,18 +986,24 @@ static MUI_ENTRY jaJPBootLoaderEntries[] = { 8, 12, - "ÌÞ°ÄÛ°ÀÞ¦ Ê°ÄÞÃÞ¨½¸ (Ìްľ¸À)Æ ²Ý½Ä°Ù ½Ù¡", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "ÌÞ°ÄÛ°ÀÞ¦ ÌÛ¯Ëß° ÃÞ¨½¸Æ ²Ý½Ä°Ù ½Ù¡", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + "ÌÞ°ÄÛ°ÀÞ¦ ÌÛ¯Ëß° ÃÞ¨½¸Æ ²Ý½Ä°Ù ½Ù¡", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, "ÌÞ°ÄÛ°ÀÞÉ ²Ý½Ä°Ù¦ ½·¯Ìß ½Ù¡", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/lang/lt-LT.h b/reactos/base/setup/usetup/lang/lt-LT.h index 7020ebbaba1..363f1f3923e 100644 --- a/reactos/base/setup/usetup/lang/lt-LT.h +++ b/reactos/base/setup/usetup/lang/lt-LT.h @@ -995,18 +995,24 @@ static MUI_ENTRY ltLTBootLoaderEntries[] = { 8, 12, - "Install bootloader on the harddisk (MBR).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on a floppy disk.", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + "Install bootloader on a floppy disk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, "Skip install bootloader.", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/lang/nl-NL.h b/reactos/base/setup/usetup/lang/nl-NL.h index 0141359d290..5ed50c609da 100644 --- a/reactos/base/setup/usetup/lang/nl-NL.h +++ b/reactos/base/setup/usetup/lang/nl-NL.h @@ -1012,18 +1012,24 @@ static MUI_ENTRY nlNLBootLoaderEntries[] = { 8, 12, - "Installeer de bootloader op de harde schijf (bootsector).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Installeer de bootloader op een floppy disk.", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + "Installeer de bootloader op een floppy disk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, "Installeren bootloader overslaan.", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/lang/pl-PL.h b/reactos/base/setup/usetup/lang/pl-PL.h index de0a55fcd5c..6237e318451 100644 --- a/reactos/base/setup/usetup/lang/pl-PL.h +++ b/reactos/base/setup/usetup/lang/pl-PL.h @@ -994,18 +994,24 @@ static MUI_ENTRY plPLBootLoaderEntries[] = { 8, 12, - " Wgraj bootloader na dysk twardy (MBR).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - " Wgraj bootloader na dyskietk©.", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + " Wgraj bootloader na dyskietk©.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, " Pomiä wgrywanie bootloadera.", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/lang/ru-RU.h b/reactos/base/setup/usetup/lang/ru-RU.h index b74d17b8e1a..268fec4a7ff 100644 --- a/reactos/base/setup/usetup/lang/ru-RU.h +++ b/reactos/base/setup/usetup/lang/ru-RU.h @@ -986,18 +986,24 @@ static MUI_ENTRY ruRUBootLoaderEntries[] = { 8, 12, - "“áâ ­®¢ª  ­  ¦¥á⪨© ¤¨áª (§ £à㧮ç­ë© ᥪâ®à).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "“áâ ­®¢ª  ­  £¨¡ª¨© ¤¨áª.", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + "“áâ ­®¢ª  ­  £¨¡ª¨© ¤¨áª.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, "¥ ãáâ ­ ¢«¨¢ âì § £àã§ç¨ª.", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/lang/sk-SK.h b/reactos/base/setup/usetup/lang/sk-SK.h index abc2d73665b..73117a45a46 100644 --- a/reactos/base/setup/usetup/lang/sk-SK.h +++ b/reactos/base/setup/usetup/lang/sk-SK.h @@ -993,18 +993,24 @@ static MUI_ENTRY skSKBootLoaderEntries[] = { 8, 12, - "Nainçtalovaœ zav dzaŸ syst‚mu na pevnì disk (zav dzac¡ sektor).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Nainçtalovaœ zav dzaŸ syst‚mu na disketu.", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + "Nainçtalovaœ zav dzaŸ syst‚mu na disketu.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, "PreskoŸiœ inçtal ciu zav dzaŸa syst‚mu.", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/lang/sv-SE.h b/reactos/base/setup/usetup/lang/sv-SE.h index 17b0fa5ddad..debbfc22b61 100644 --- a/reactos/base/setup/usetup/lang/sv-SE.h +++ b/reactos/base/setup/usetup/lang/sv-SE.h @@ -986,18 +986,24 @@ static MUI_ENTRY svSEBootLoaderEntries[] = { 8, 12, - "Install bootloader on the harddisk (MBR).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on a floppy disk.", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + "Install bootloader on a floppy disk.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, "Skip install bootloader.", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/lang/uk-UA.h b/reactos/base/setup/usetup/lang/uk-UA.h index f5da61e6e0c..fc970357058 100644 --- a/reactos/base/setup/usetup/lang/uk-UA.h +++ b/reactos/base/setup/usetup/lang/uk-UA.h @@ -991,18 +991,24 @@ static MUI_ENTRY ukUABootLoaderEntries[] = { 8, 12, - "‚áâ ­®¢¨â¨ bootloader ­  ¦®àá⪨© ¤¨áª (bootsector).", + "Install bootloader on the harddisk (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "‚áâ ­®¢¨â¨ bootloader ­  ¤¨áª¥âã.", + "Install bootloader on the harddisk (VBR only).", TEXT_STYLE_NORMAL }, { 8, 14, + "‚áâ ­®¢¨â¨ bootloader ­  ¤¨áª¥âã.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, "¥ ¢áâ ­®¢«î¢ â¨ bootloader.", TEXT_STYLE_NORMAL }, diff --git a/reactos/base/setup/usetup/usetup.h b/reactos/base/setup/usetup/usetup.h index ff7cf87fb84..bbb4212891c 100644 --- a/reactos/base/setup/usetup/usetup.h +++ b/reactos/base/setup/usetup/usetup.h @@ -108,7 +108,8 @@ typedef enum _PAGE_NUMBER REGISTRY_PAGE, BOOT_LOADER_PAGE, BOOT_LOADER_FLOPPY_PAGE, - BOOT_LOADER_HARDDISK_PAGE, + BOOT_LOADER_HARDDISK_MBR_PAGE, + BOOT_LOADER_HARDDISK_VBR_PAGE, REPAIR_INTRO_PAGE,