From 77b07c3a965bb950cee23b165f54de12cf8a3b89 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Sun, 11 Mar 2012 21:09:16 +0000
Subject: [PATCH] [CLT2012] - Partly revert r53422 to allow hybrid CD booting
 again. Thanks to Giannis.

svn path=/branches/ros-branch-0_3_14-clt2012/; revision=56123
---
 boot/freeldr/freeldr/bootmgr.c | 12 +++++++++---
 hybridcd_freeldr.ini           |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/boot/freeldr/freeldr/bootmgr.c b/boot/freeldr/freeldr/bootmgr.c
index 6426eca0ec7..3cba63f8811 100644
--- a/boot/freeldr/freeldr/bootmgr.c
+++ b/boot/freeldr/freeldr/bootmgr.c
@@ -231,15 +231,20 @@ VOID RunLoader(VOID)
 		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 @@ VOID RunLoader(VOID)
 		{
 			LoadAndBootDrive(SectionName);
 		}
+#endif
 #else
 		LoadAndBootWindows(SectionName, SettingValue, _WIN32_WINNT_WS03);
 #endif
diff --git a/hybridcd_freeldr.ini b/hybridcd_freeldr.ini
index a8722ccf0f6..c33940844ba 100644
--- a/hybridcd_freeldr.ini
+++ b/hybridcd_freeldr.ini
@@ -24,7 +24,7 @@ Install="ReactOS-Installation starten"
 Live="ReactOS Live-System starten"
 
 [Install]
-BootType=ReactOSSetup2
+BootType=ReactOSSetup
 
 [Live]
 BootType=Windows2003