[ros-diffs] [arty] 28311: Make boot options for the bootcd dependent on DBG. Suggested by Caemyr.

[arty at svn.reactos.org]

Author: arty
Date: Mon Aug 13 07:10:40 2007
New Revision: 28311

URL: http://svn.reactos.org/svn/reactos?rev=28311&view=rev
Log:
Make boot options for the bootcd dependent on DBG.  Suggested by Caemyr.

Modified:
    trunk/reactos/boot/bootdata/txtsetup.sif
    trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c

Modified: trunk/reactos/boot/bootdata/txtsetup.sif
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif?rev=28311&r1=28310&r2=28311&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/txtsetup.sif (original)
+++ trunk/reactos/boot/bootdata/txtsetup.sif Mon Aug 13 07:10:40 2007
@@ -39,8 +39,8 @@
 
 [SetupData]
 DefaultPath = \ReactOS
-;OsLoadOptions = "/NOGUIBOOT /NODEBUG"
-OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1"
+OsLoadOptions = "/NOGUIBOOT /NODEBUG"
+DbgOsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1"
 ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=SCREEN"
 ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS"
 

Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c?rev=28311&r1=28310&r2=28311&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Mon Aug 13 07:10:40 2007
@@ -166,7 +166,7 @@
   ULONG_PTR Base;
   ULONG Size;
   const char *SourcePath;
-  const char *LoadOptions;
+  const char *LoadOptions = "", *DbgLoadOptions = "";
   char szKernelName[256];
 
   HINF InfHandle;
@@ -249,8 +249,18 @@
       return;
     }
 
-  /* Get load options */
-  if (!InfFindFirstLine (InfHandle,
+#ifdef DBG
+  /* Get load options */  
+  if (InfFindFirstLine (InfHandle,
+			"SetupData",
+			"DbgOsLoadOptions",
+			&InfContext))
+    {
+	if (!InfGetDataField (&InfContext, 1, &DbgLoadOptions))
+	    DbgLoadOptions = "";
+    }
+#endif
+  if (!strlen(DbgLoadOptions) && !InfFindFirstLine (InfHandle,
 			 "SetupData",
 			 "OsLoadOptions",
 			 &InfContext))
@@ -283,8 +293,8 @@
 
   /* Set kernel command line */
   MachDiskGetBootPath(reactos_kernel_cmdline, sizeof(reactos_kernel_cmdline));
-  strcat(strcat(strcat(reactos_kernel_cmdline, SourcePath), " "),
-         LoadOptions);
+  strcat(strcat(strcat(strcat(reactos_kernel_cmdline, SourcePath), " "),
+		LoadOptions), DbgLoadOptions);
 
   strcpy(SystemRoot, SourcePath);
   strcat(SystemRoot, "\\");