[ros-diffs] [silverblade] 38813: Treat "LiveCD" system path as a prefix rather than an entire path. This allows a custom path to be specified, 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.

silverblade at svn.reactos.org silverblade at svn.reactos.org
Sat Jan 17 15:20:48 CET 2009


Author: silverblade
Date: Sat Jan 17 08:20:47 2009
New Revision: 38813

URL: http://svn.reactos.org/svn/reactos?rev=38813&view=rev
Log:
Treat "LiveCD" system path as a prefix rather than an entire path. This allows a custom path to be specified,
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.


Modified:
    trunk/reactos/boot/bootdata/livecd.ini
    trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c

Modified: trunk/reactos/boot/bootdata/livecd.ini
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.ini?rev=38813&r1=38812&r2=38813&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/livecd.ini [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/livecd.ini [iso-8859-1] Sat Jan 17 08:20:47 2009
@@ -24,5 +24,5 @@
 
 [ReactOS]
 BootType=ReactOS
-SystemPath=LiveCD
+SystemPath=LiveCD\reactos
 Options=/DEBUGPORT=COM1 /SOS

Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c?rev=38813&r1=38812&r2=38813&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Sat Jan 17 08:20:47 2009
@@ -574,6 +574,7 @@
 	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 @@
 	/*
 	 * 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");
 	}



More information about the Ros-diffs mailing list