[cgutman] 48703: [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 :)
Author: cgutman Date: Sun Sep 5 17:09:18 2010 New Revision: 48703
URL: http://svn.reactos.org/svn/reactos?rev=48703&view=rev Log: [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 :)
Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/bootsup.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/usetup.h
Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.c... ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -2156,6 +2156,28 @@ #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,
Modified: trunk/reactos/base/setup/usetup/bootsup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.h... ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -79,6 +79,12 @@ UCHAR PartitionType);
NTSTATUS +InstallVBRToPartition(PUNICODE_STRING SystemRootPath, + PUNICODE_STRING SourceRootPath, + PUNICODE_STRING DestinationArcPath, + UCHAR PartitionType); + +NTSTATUS InstallFatBootcodeToFloppy(PUNICODE_STRING SourceRootPath, PUNICODE_STRING DestinationArcPath);
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interface... ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -3480,7 +3480,7 @@ /* 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 @@
Line++; if (Line<12) - Line=14; - - if (Line>14) + Line=15; + + if (Line>15) Line=12;
CONSOLE_InvertTextXY(8, Line, 60, 1); @@ -3511,9 +3511,9 @@
Line--; if (Line<12) - Line=14; - - if (Line>14) + Line=15; + + if (Line>15) Line=12;
CONSOLE_InvertTextXY(8, Line, 60, 1); @@ -3530,13 +3530,17 @@ { if (Line == 12) { - return BOOT_LOADER_HARDDISK_PAGE; + return BOOT_LOADER_HARDDISK_MBR_PAGE; } else if (Line == 13) { + return BOOT_LOADER_HARDDISK_VBR_PAGE; + } + else if (Line == 14) + { return BOOT_LOADER_FLOPPY_PAGE; } - else if (Line == 14) + else if (Line == 15) { return SUCCESS_PAGE; } @@ -3592,9 +3596,30 @@ return BOOT_LOADER_FLOPPY_PAGE; }
- static PAGE_NUMBER -BootLoaderHarddiskPage(PINPUT_RECORD Ir) +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 +BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) { UCHAR PartitionType; NTSTATUS Status; @@ -3604,24 +3629,12 @@ /* 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 @@ 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 */
Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-B... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -995,18 +995,24 @@ { 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, - 14, + 15, " ¥ ᥠ᫠£ § ०¤ ç.", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-C... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -993,18 +993,24 @@ { 8, 12, - "Nainstalovat zavadØ na disk (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, "Nainstalovat zavadØ na disketu.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Pýeskoit instalaci zavadØe.", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-D... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -986,18 +986,24 @@ { 8, 12, - "Boot-Loader auf der Festplatte installieren (Bootsektor).", + "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, "Boot-Loader auf einer Diskette installieren.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Boot-Loader nicht installieren.", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-G... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -1009,18 +1009,24 @@ { 8, 12, - "¡«á©«© «¦¬ bootloader ©«¦ ©¡¢¨æ å©¡¦ (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, "¡«á©«© «¦¬ bootloader © £ ©¡â«.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, " £ å¤ ¡«á©«© «¦¬ bootloader.", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-U... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -985,18 +985,24 @@ { 8, 12, - "Install bootloader on the harddisk (bootsector).", + "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, "Install bootloader on a floppy disk.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Skip install bootloader.", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-E... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -992,18 +992,24 @@ { 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, + "Install bootloader on the harddisk (VBR only).", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, "Instalar cargador de inicio en un disquete.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Omitir la instalaci¢n del cargador de arranque.", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-E... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -985,18 +985,24 @@ { 8, 12, - "Paigalda alglaadur kävakettale (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, "Paigalda alglaadur flopikettale.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "ra paigalda alglaadurit.", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-F... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -998,18 +998,24 @@ { 8, 12, - "Installer le chargeur de dmarrage sur le disque dur (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, "Installer le chargeur de dmarrage sur une disquette.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Ne pas installer le chargeur de dmarrage.", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-I... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -986,18 +986,24 @@ { 8, 12, - "Installazione del bootloader sul disco fisso (settore di avvio).", + "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, "Installazione del bootloader su un disco floppy.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Salta l'installazione del bootloader.", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-J... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -986,18 +986,24 @@ { 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, - 14, + 15, "ÌÞ°ÄÛ°ÀÞÉ ²Ý½Ä°Ù¦ ½·¯Ìß ½Ù¡", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-L... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -995,18 +995,24 @@ { 8, 12, - "Install bootloader on the harddisk (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, "Install bootloader on a floppy disk.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Skip install bootloader.", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-N... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -1012,18 +1012,24 @@ { 8, 12, - "Installeer de bootloader op de harde schijf (bootsector).", + "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, "Installeer de bootloader op een floppy disk.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Installeren bootloader overslaan.", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-P... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -994,18 +994,24 @@ { 8, 12, - " Wgraj bootloader na dysk twardy (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, " Wgraj bootloader na dyskietk©.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, " Pomiä wgrywanie bootloadera.", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-R... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -986,18 +986,24 @@ { 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, - 14, + 15, "¥ ãáâ ¢«¨¢ âì § £àã§ç¨ª.", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-S... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -993,18 +993,24 @@ { 8, 12, - "Nainçtalova zav dza systmu na pevnì disk (zav dzac¡ sektor).", + "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, "Nainçtalova zav dza systmu na disketu.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Preskoi inçtal ciu zav dzaa systmu.", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-S... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -986,18 +986,24 @@ { 8, 12, - "Install bootloader on the harddisk (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, "Install bootloader on a floppy disk.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "Skip install bootloader.", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-U... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -991,18 +991,24 @@ { 8, 12, - "áâ ®¢¨â¨ bootloader ¦®àá⪨© ¤¨áª (bootsector).", + "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, "áâ ®¢¨â¨ bootloader ¤¨áª¥âã.", TEXT_STYLE_NORMAL }, { 8, - 14, + 15, "¥ ¢áâ ®¢«î¢ ⨠bootloader.", TEXT_STYLE_NORMAL },
Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h?... ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Sun Sep 5 17:09:18 2010 @@ -108,7 +108,8 @@ 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,
-
cgutman＠svn.reactos.org