Author: tfaber Date: Sun Mar 11 21:09:16 2012 New Revision: 56123
URL: http://svn.reactos.org/svn/reactos?rev=56123&view=rev Log: [CLT2012] - Partly revert r53422 to allow hybrid CD booting again. Thanks to Giannis.
Modified: branches/ros-branch-0_3_14-clt2012/boot/freeldr/freeldr/bootmgr.c branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini
Modified: branches/ros-branch-0_3_14-clt2012/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/f... ============================================================================== --- branches/ros-branch-0_3_14-clt2012/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Sun Mar 11 21:09:16 2012 @@ -231,15 +231,20 @@ IniOpenSection("Operating Systems", &SectionId); IniReadSettingByName(SectionId, SectionName, SettingValue, sizeof(SettingValue));
+#ifndef _M_ARM // Install the drive mapper according to this sections drive mappings #if defined(_M_IX86) && !defined(_MSC_VER) DriveMapMapDrivesInSection(SectionName); #endif
#ifdef FREELDR_REACTOS_SETUP - // WinLdr-style boot - LoadReactOSSetup(); -#elif defined(_M_IX86) + if (_stricmp(BootType, "ReactOSSetup") == 0) + { + LoadReactOSSetup(); + } + else +#endif +#ifdef _M_IX86 if (_stricmp(BootType, "Windows") == 0) { LoadAndBootWindows(SectionName, SettingValue, 0); @@ -268,6 +273,7 @@ { LoadAndBootDrive(SectionName); } +#endif #else LoadAndBootWindows(SectionName, SettingValue, _WIN32_WINNT_WS03); #endif
Modified: branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/hybrid... ============================================================================== --- branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini [iso-8859-1] Sun Mar 11 21:09:16 2012 @@ -24,7 +24,7 @@ Live="ReactOS Live-System starten"
[Install] -BootType=ReactOSSetup2 +BootType=ReactOSSetup
[Live] BootType=Windows2003