[ros-diffs] [hpoussin] 43273: WINLDR: Finally, set Windows boot style as default Many thanks to Fireball and Alex for your hard work on Windows boot style

Author: hpoussin
Date: Sat Oct  3 22:09:57 2009
New Revision: 43273

URL: http://svn.reactos.org/svn/reactos?rev=43273&view=rev
Log:
WINLDR: Finally, set Windows boot style as default
Many thanks to Fireball and Alex for your hard work on Windows boot style

Modified:
    trunk/reactos/base/setup/usetup/bootsup.c
    trunk/reactos/boot/bootdata/bootcd.ini
    trunk/reactos/boot/bootdata/livecd.ini

Modified: trunk/reactos/base/setup/usetup/bootsup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.…
==============================================================================
--- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Sat Oct  3 22:09:57 2009
@@ -415,13 +415,13 @@
     /* ReactOS */
     CreateFreeLoaderEntry(IniCache, IniSection,
         L"ReactOS", L"\"ReactOS\"",
-        L"ReactOS", ArcPath,
+        L"Windows2003", ArcPath,
         L"");
 
     /* ReactOS_Debug */
     CreateFreeLoaderEntry(IniCache, IniSection,
         L"ReactOS_Debug", L"\"ReactOS (Debug)\"",
-        L"ReactOS", ArcPath,
+        L"Windows2003", ArcPath,
         L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS");
 
 #if DBG
@@ -431,18 +431,24 @@
         L"ReactOS", ArcPath,
         L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL");
 
-    /* ReactOS_WinLdr */
-    CreateFreeLoaderEntry(IniCache, IniSection,
-        L"ReactOS_WinLdr", L"\"ReactOS (WinLdr)\"",
-        L"Windows2003", ArcPath,
-        L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS");
-
     /* ReactOS_Ram */
     CreateFreeLoaderEntry(IniCache, IniSection,
         L"ReactOS_Ram", L"\"ReactOS (RAM Disk)\"",
         L"ReactOS", L"ramdisk(0)\\ReactOS",
         L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img
/RDIMAGEOFFSET=32256");
 #endif
+
+    /* ReactOS_old */
+    CreateFreeLoaderEntry(IniCache, IniSection,
+        L"ReactOS_old", L"\"ReactOS (old boot method)\"",
+        L"ReactOS", ArcPath,
+        L"");
+
+    /* ReactOS_Debug_old */
+    CreateFreeLoaderEntry(IniCache, IniSection,
+        L"ReactOS_Debug_old", L"\"ReactOS (Debug, old boot
method)\"",
+        L"ReactOS", ArcPath,
+        L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS");
 
   /* Save the ini file */
   IniCacheSave(IniCache, IniPath);

Modified: trunk/reactos/boot/bootdata/bootcd.ini
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd.ini?r…
==============================================================================
--- trunk/reactos/boot/bootdata/bootcd.ini [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/bootcd.ini [iso-8859-1] Sat Oct  3 22:09:57 2009
@@ -1,6 +1,6 @@
 [FREELOADER]
 DefaultOS=Setup
-Timeout=0
+Timeout=1
 
 [Display]
 TitleText=ReactOS Setup
@@ -21,6 +21,10 @@
 
 [Operating Systems]
 Setup="Setup"
+Setup_old="Setup (old boot method)"
 
 [Setup]
-BootType=ReactOSSetup
+BootType=ReactOSSetup2
+
+[Setup_old]
+BootType=ReactOSSetup

Modified: trunk/reactos/boot/bootdata/livecd.ini
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.ini?r…
==============================================================================
--- trunk/reactos/boot/bootdata/livecd.ini [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/livecd.ini [iso-8859-1] Sat Oct  3 22:09:57 2009
@@ -1,6 +1,6 @@
 [FREELOADER]
 DefaultOS=ReactOS
-Timeout=0
+Timeout=1
 
 [Display]
 TitleText=ReactOS Boot Manager
@@ -21,8 +21,14 @@
 
 [Operating Systems]
 ReactOS="ReactOS"
+Reactos_old="ReactOS (old boot method)"
 
 [ReactOS]
+BootType=Windows2003
+SystemPath=LiveCD\reactos
+Options=/DEBUGPORT=COM1 /SOS /MININT
+
+[Reactos_old]
 BootType=ReactOS
 SystemPath=LiveCD\reactos
 Options=/DEBUGPORT=COM1 /SOS