Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-03 01:50:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Treat "LiveCD" system path as a prefix rather than an entire path. This allows a custom path to be specified,

Browse source 
so FreeLDR can boot multiple ReactOS builds from the same CD. FreeLDR happily does this, ReactOS does not like
booting from a livecd path other than \reactos however. Updated livecd.ini to use the new style of livecd
system path.


svn path=/trunk/; revision=38813
This commit is contained in:
Andrew Greenwood 2009-01-17 14:20:47 +00:00
parent 2429c7df65
commit afff2765ab
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/boot/bootdata/livecd.ini
View file

@ -24,5 +24,5 @@ ReactOS="ReactOS"
[ReactOS]
BootType=ReactOS
SystemPath=LiveCD
SystemPath=LiveCD\reactos
Options=/DEBUGPORT=COM1 /SOS

7
reactos/boot/freeldr/freeldr/reactos/reactos.c
View file

@ -574,6 +574,7 @@ LoadAndBootReactOS(PCSTR OperatingSystemName)
CHAR name[255];
CHAR value[255];
CHAR SystemPath[255];
CHAR LivePath[255];
CHAR szKernelName[255];
CHAR szFileName[255];
CHAR MsgBuffer[256];
@ -704,11 +705,13 @@ LoadAndBootReactOS(PCSTR OperatingSystemName)
/*
* Special case for Live CD.
*/
if (!_stricmp(SystemPath, "LiveCD"))
if (!_strnicmp(SystemPath, "LiveCD", strlen("LiveCD")))
{
/* Use everything following the "LiveCD" string as the path */
strcpy(LivePath, SystemPath + strlen("LiveCD"));
/* Normalize */
MachDiskGetBootPath(SystemPath, sizeof(SystemPath));
strcat(SystemPath, "\\reactos");
strcat(SystemPath, LivePath);
strcat(strcpy(reactos_kernel_cmdline, SystemPath),
" /MININT");
}