[cfinck] 49052: Remove the entries for the old boot method. If the old boot method is finally obsolete, this should go to Trunk as well along with removing the old boot method entirely from Freeloa...

Author: cfinck
Date: Fri Oct  8 14:53:51 2010
New Revision: 49052

URL: http://svn.reactos.org/svn/reactos?rev=49052&view=rev
Log:
Remove the entries for the old boot method.
If the old boot method is finally obsolete, this should go to Trunk as well along with removing the old boot method entirely from Freeloader.

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

Modified: branches/ros-branch-0_3_12/reactos/base/setup/usetup/bootsup.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/base/s...
==============================================================================
--- branches/ros-branch-0_3_12/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original)
+++ branches/ros-branch-0_3_12/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Fri Oct  8 14:53:51 2010
@@ -513,18 +513,6 @@
         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);

Modified: branches/ros-branch-0_3_12/reactos/boot/bootdata/bootcd.ini
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/boot/b...
==============================================================================
--- branches/ros-branch-0_3_12/reactos/boot/bootdata/bootcd.ini [iso-8859-1] (original)
+++ branches/ros-branch-0_3_12/reactos/boot/bootdata/bootcd.ini [iso-8859-1] Fri Oct  8 14:53:51 2010
@@ -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_12/reactos/boot/bootdata/livecd.ini
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/boot/b...
==============================================================================
--- branches/ros-branch-0_3_12/reactos/boot/bootdata/livecd.ini [iso-8859-1] (original)
+++ branches/ros-branch-0_3_12/reactos/boot/bootdata/livecd.ini [iso-8859-1] Fri Oct  8 14:53:51 2010
@@ -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