On 05/01/2015 00:49, hbelu...@svn.reactos.org wrote: > Author: hbelusca > Date: Sun Jan 4 23:49:18 2015 > New Revision: 65982 > > URL: http://svn.reactos.org/svn/reactos?rev=65982&view=rev > Log: > [FREELDR] > - Correctly append a backslash to the BootPath (if needed). > - Be able to specify relative boot paths (relative to the current boot > device): as a consequence, remove the "LiveCD" hackish special value that was > introduced long long ago. > - Fix BootPath retrieval in ReactOSSetup mode (via the SystemPath optional > value), and use a better way to build the temporary txtsetup.sif full file > names. > > As a consequence we can now build hybrid cds with the following architecture: > \ > --> loader\ (bootsectors + free/setupldr.sys) > --> myboot\ (contents of what_defaults_to_reactos directory for the bootcd) > --> mylive\ (contents of what_defaults_to_reactos directory for the livecd) > --> <regular_files> > and > freeldr.ini specifying the following values: > > ; The Setup entry > [Setup] > BootType=ReactOSSetup > SystemPath=\myboot > > ; The LiveCD entry > [LiveCD] > BootType=Windows2003 > SystemPath=\mylive > Options=/MININT > > Part 2/2 > CORE-9023 > > Modified: > trunk/reactos/boot/bootdata/livecd.ini > trunk/reactos/boot/freeldr/freeldr/CHANGELOG > trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c > trunk/reactos/boot/freeldr/freeldr/windows/winldr.c > > Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c?rev=65982&r1=65981&r2=65982&view=diff > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] > (original) > +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] > Sun Jan 4 23:49:18 2015 > @@ -178,17 +178,40 @@ > HasSection = IniOpenSection(SectionName, &SectionId); > > UiDrawBackdrop(); > - UiDrawProgressBarCenter(1, 100, "Loading NT..."); > + UiDrawProgressBarCenter(1, 100, "Loading ReactOS Setup..."); > > /* Read the system path is set in the .ini file */ > if (!HasSection || > !IniReadSettingByName(SectionId, "SystemPath", BootPath, > sizeof(BootPath))) > { > + // MachDiskGetBootPath(BootPath, sizeof(BootPath)); > + // strcpy(BootPath, SectionName); > + }
Why? Can you please stop commenting out code without further explanations? Either you comment out (better doing so with #if 0, for the record) and you explain why you do so alongside in the code, for next developers coming into the code, or you don't comment out. So, just don't answer here, just commit an explanation ;-). Cheers, -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.
smime.p7s
Description: S/MIME Cryptographic Signature
_______________________________________________ Ros-dev mailing list Ros-dev@reactos.org http://www.reactos.org/mailman/listinfo/ros-dev
