Use KDTERM

boot/bootdata/hybridcd.ini

@@ -11,11 +11,11 @@ Setup="Setup"
 Setup_Debug="Setup (Debug)"
 Setup_Screen="Setup (Screen)"
 LiveCD="LiveCD"
-LiveCD_Debug="LiveCD (Debug)"
+LiveCD_Debug="LiveCD (Debug) KDTERM SCREEN"
 LiveCD_Screen="LiveCD (Screen)"
 LiveCD_LogFile="LiveCD (Log file)"
 LiveCD_RamDisk="LiveCD in RAM"
-LiveCD_RamDisk_Debug="LiveCD in RAM (Debug)"
+LiveCD_RamDisk_Debug="LiveCD in RAM (Debug) kDTERM SCREEN"
 LiveCD_RamDisk_Screen="LiveCD in RAM (Screen)"
 
 [Setup]
@@ -40,7 +40,7 @@ Options=/MININT
 [LiveCD_Debug]
 BootType=Windows2003
 SystemPath=\livecd\reactos
-Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT
+Options=/DEBUG /KDOUTPUT=SCREEN /DEBUGPORT=TERM /BAUDRATE=115200 /SOS /MININT
 
 [LiveCD_Screen]
 BootType=Windows2003
@@ -60,7 +60,7 @@ Options=/MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD
 [LiveCD_RamDisk_Debug]
 BootType=Windows2003
 SystemPath=ramdisk(0)\reactos
-Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD
+Options=/DEBUG /KDOUTPUT=SCREEN /DEBUGPORT=TERM /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD
 
 [LiveCD_RamDisk_Screen]
 BootType=Windows2003

boot/bootdata/livecd.ini

@@ -1,5 +1,5 @@
 [FREELOADER]
-DefaultOS=LiveCD_Debug
+DefaultOS=LiveCD_Debug_KDTERM
 TimeOut=5
 
 [Display]
@@ -9,6 +9,7 @@ MinimalUI=Yes
 [Operating Systems]
 LiveCD="LiveCD"
 LiveCD_Debug="LiveCD (Debug)"
+LiveCD_Debug_KDTERM="LiveCD (Debug) KDTERM SCREEN"
 LiveCD_Macpi="LiveCD ACPI SMP (Debug)"
 LiveCD_Aacpi="LiveCD ACPI APIC (Debug)"
 LiveCD_VBoxDebug="LiveCD (VBox Debug)"
@@ -25,6 +26,11 @@ BootType=Windows2003
 SystemPath=\reactos
 Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT
 
+[LiveCD_Debug_KDTERM]
+BootType=Windows2003
+SystemPath=\reactos
+Options=/DEBUG /KDOUTPUT=SCREEN /DEBUGPORT=TERM /SOS /FASTDETECT /MININT
+
 [LiveCD_Macpi]
 BootType=Windows2003
 SystemPath=\reactos

boot/bootdata/txtsetup.sif

@@ -95,6 +95,7 @@ buslogic.sys = 1,,,,,,x,4,,,,1,4
 blue.sys     = 1,,,,,,x,4,,,,1,4
 vgafonts.cab = 1,,,,,,,1,,,,1,1
 bootvid.dll  = 1,,,,,,,2,,,,1,2
+kdterm.dll  = 1,,,,,,,2,,,,1,2
 c_437.nls    = 1,,,,,,,2,,,,1,2
 c_1252.nls   = 1,,,,,,,2,,,,1,2
 cdfs.sys     = 1,,,,,,x,4,,,,1,4

modules/CMakeLists.txt

@@ -55,3 +55,19 @@ endif()
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/optional/DroidSansFallback.ttf)
     add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/optional/DroidSansFallback.ttf" DESTINATION reactos/Fonts FOR livecd)
 endif()
+
+## Slipstreaming drivers
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/drivers/)
+    file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/ ${CMAKE_CURRENT_SOURCE_DIR}/drivers/*)
+    foreach(item ${EXTRA_FILES})
+        add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/${item} DESTINATION reactos/system32/drivers NO_CAB NAME_ON_CD ${item} FOR all)
+    endforeach(item)
+endif()
+
+## Slipstreaming drivers
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/system32/)
+    file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/system32/ ${CMAKE_CURRENT_SOURCE_DIR}/system32/*)
+    foreach(item ${EXTRA_FILES})
+        add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/system32/${item} DESTINATION reactos/system32 NO_CAB NAME_ON_CD ${item} FOR all)
+    endforeach(item)
+endif()