Revert to the old boot method for the release on request of Aleksey

svn path=/branches/ros-branch-0_3_11/; revision=44367

diff --git a/reactos/base/setup/usetup/bootsup.c b/reactos/base/setup/usetup/bootsup.c
index fe835ff..c6cebab 100644 (file)
--- a/reactos/base/setup/usetup/bootsup.c
+++ b/reactos/base/setup/usetup/bootsup.c
@@ -415,13 +415,13 @@ CreateFreeLoaderIniForReactos(PWCHAR IniPath,
     /* 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
@@ -444,18 +444,6 @@ CreateFreeLoaderIniForReactos(PWCHAR IniPath,
         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);
   IniCacheDestroy(IniCache);

diff --git a/reactos/boot/bootdata/bootcd.ini b/reactos/boot/bootdata/bootcd.ini
index c0bbf70..309b16b 100644 (file)
--- a/reactos/boot/bootdata/bootcd.ini
+++ b/reactos/boot/bootdata/bootcd.ini
@@ -1,6 +1,6 @@
 [FREELOADER]
 DefaultOS=Setup
-Timeout=1
+Timeout=0
 
 [Display]
 TitleText=ReactOS Setup
@@ -21,10 +21,6 @@ SelectedColor=Gray
 
 [Operating Systems]
 Setup="Setup"
-Setup_old="Setup (old boot method)"
 
 [Setup]
-BootType=ReactOSSetup2
-
-[Setup_old]
 BootType=ReactOSSetup

diff --git a/reactos/boot/bootdata/livecd.ini b/reactos/boot/bootdata/livecd.ini
index e43dbf6..d34a5d0 100644 (file)
--- a/reactos/boot/bootdata/livecd.ini
+++ b/reactos/boot/bootdata/livecd.ini
@@ -1,6 +1,6 @@
 [FREELOADER]
 DefaultOS=ReactOS
-Timeout=1
+Timeout=0
 
 [Display]
 TitleText=ReactOS Boot Manager
@@ -21,14 +21,8 @@ SelectedColor=Gray
 
 [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