[BOOTDATA] Fix boot (addendum to dd56e065bcb1cf366d7f6bf11d6ff9d37baf91e4)

- GenCdRom is actually required now to be in CDDB
- Forgot to add partmgr registry keys

CORE-6264

diff --git a/boot/bootdata/setupreg.inf b/boot/bootdata/setupreg.inf
index 47d2d44..ed841fd 100644 (file)
--- a/boot/bootdata/setupreg.inf
+++ b/boot/bootdata/setupreg.inf
@@ -20,7 +20,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE"
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09"
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB"
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB20"
-HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenCdRom"
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenDisk"
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_03"
 HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GENERIC_HID_DEVICE"

diff --git a/drivers/storage/partmgr/CMakeLists.txt b/drivers/storage/partmgr/CMakeLists.txt
index 92a9093..275fc30 100644 (file)
--- a/drivers/storage/partmgr/CMakeLists.txt
+++ b/drivers/storage/partmgr/CMakeLists.txt
@@ -15,5 +15,5 @@ add_library(partmgr MODULE
 add_pch(partmgr partmgr.h "${PCH_SKIP_SOURCE}")
 set_module_type(partmgr kernelmodedriver)
 add_importlibs(partmgr ntoskrnl hal)
-# add_registry_inf(partmgr_reg.inf)
+add_registry_inf(partmgr_reg.inf)
 add_cd_file(TARGET partmgr DESTINATION reactos/system32/drivers NO_CAB FOR all)