[ros-diffs] [cfinck] 44367: Revert to the old boot method for the release on request of Aleksey

Author: cfinck
Date: Wed Dec  2 21:02:07 2009
New Revision: 44367

URL: http://svn.reactos.org/svn/reactos?rev=44367&view=rev
Log:
Revert to the old boot method for the release on request of Aleksey

Modified:
    branches/ros-branch-0_3_11/reactos/base/setup/usetup/bootsup.c
    branches/ros-branch-0_3_11/reactos/boot/bootdata/bootcd.ini
    branches/ros-branch-0_3_11/reactos/boot/bootdata/livecd.ini

Modified: branches/ros-branch-0_3_11/reactos/base/setup/usetup/bootsup.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/base/…
==============================================================================
--- branches/ros-branch-0_3_11/reactos/base/setup/usetup/bootsup.c [iso-8859-1]
(original)
+++ branches/ros-branch-0_3_11/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Wed Dec  2
21:02:07 2009
@@ -415,13 +415,13 @@
     /* ReactOS */
     CreateFreeLoaderEntry(IniCache, IniSection,
         L"ReactOS", L"\"ReactOS\"",
-        L"Windows2003", ArcPath,
+        L"ReactOS", ArcPath,
         L"");
 
     /* ReactOS_Debug */
     CreateFreeLoaderEntry(IniCache, IniSection,
         L"ReactOS_Debug", L"\"ReactOS (Debug)\"",
-        L"Windows2003", ArcPath,
+        L"ReactOS", ArcPath,
         L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS");
 
 #if DBG
@@ -443,18 +443,6 @@
         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: branches/ros-branch-0_3_11/reactos/boot/bootdata/bootcd.ini
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/boot/…
==============================================================================
--- branches/ros-branch-0_3_11/reactos/boot/bootdata/bootcd.ini [iso-8859-1] (original)
+++ branches/ros-branch-0_3_11/reactos/boot/bootdata/bootcd.ini [iso-8859-1] Wed Dec  2
21:02:07 2009
@@ -1,6 +1,6 @@
 [FREELOADER]
 DefaultOS=Setup
-Timeout=1
+Timeout=0
 
 [Display]
 TitleText=ReactOS Setup
@@ -21,10 +21,6 @@
 
 [Operating Systems]
 Setup="Setup"
-Setup_old="Setup (old boot method)"
 
 [Setup]
-BootType=ReactOSSetup2
-
-[Setup_old]
 BootType=ReactOSSetup

Modified: branches/ros-branch-0_3_11/reactos/boot/bootdata/livecd.ini
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/boot/…
==============================================================================
--- branches/ros-branch-0_3_11/reactos/boot/bootdata/livecd.ini [iso-8859-1] (original)
+++ branches/ros-branch-0_3_11/reactos/boot/bootdata/livecd.ini [iso-8859-1] Wed Dec  2
21:02:07 2009
@@ -1,6 +1,6 @@
 [FREELOADER]
 DefaultOS=ReactOS
-Timeout=1
+Timeout=0
 
 [Display]
 TitleText=ReactOS Boot Manager
@@ -21,14 +21,8 @@
 
 [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