diff --git a/boot/bootdata/livecd.ini b/boot/bootdata/livecd.ini index f36197c2e1d5a..2c45ca5a51886 100644 --- a/boot/bootdata/livecd.ini +++ b/boot/bootdata/livecd.ini @@ -1,5 +1,5 @@ [FREELOADER] -DefaultOS=LiveCD_Debug +DefaultOS=LiveCD_Macpi TimeOut=5 [Display] @@ -7,45 +7,21 @@ TitleText=ReactOS LiveCD MinimalUI=Yes [Operating Systems] -LiveCD="LiveCD" -LiveCD_Debug="LiveCD (Debug)" -LiveCD_Macpi="LiveCD ACPI SMP (Debug)" -LiveCD_Aacpi="LiveCD ACPI APIC (Debug)" -LiveCD_VBoxDebug="LiveCD (VBox Debug)" -LiveCD_Screen="LiveCD (Screen)" -LiveCD_LogFile="LiveCD (Log file)" +LiveCD="LiveCD ACPI SMP" +LiveCD_Debug="LiveCD ACPI SMP (Debug kdnet)" +LiveCD_Macpi="LiveCD ACPI SMP (Debug COM)" [LiveCD] BootType=Windows2003 SystemPath=\reactos -Options=/FASTDETECT /MININT +Options=/HAL=halmacpi.dll /KERNEL=ntkrnlmp.exe /FASTDETECT /MININT [LiveCD_Debug] BootType=Windows2003 SystemPath=\reactos -Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT +Options=/HAL=halmacpi.dll /KERNEL=ntkrnlmp.exe /DEBUG /DEBUGPORT=NET /HOST_IP=10.0.0.175 /HOST_PORT=50000 /ENCRYPTION_KEY=make.reactos.great.again /W2003 /CPUFREQ=3000 /SOS /FASTDETECT /MININT [LiveCD_Macpi] BootType=Windows2003 SystemPath=\reactos Options=/HAL=halmacpi.dll /KERNEL=ntkrnlmp.exe /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT - -[LiveCD_Aacpi] -BootType=Windows2003 -SystemPath=\reactos -Options=/HAL=halaacpi.dll /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT - -[LiveCD_VBoxDebug] -BootType=Windows2003 -SystemPath=\reactos -Options=/DEBUG /DEBUGPORT=VBOX /SOS /FASTDETECT /MININT - -[LiveCD_Screen] -BootType=Windows2003 -SystemPath=\reactos -Options=/DEBUG /DEBUGPORT=SCREEN /SOS /FASTDETECT /MININT - -[LiveCD_LogFile] -BootType=Windows2003 -SystemPath=\reactos -Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /FASTDETECT /MININT diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 618de5c940bdd..46b4089b725ba 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -55,3 +55,11 @@ 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 KDNET +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 NAME_ON_CD ${item} FOR all) + endforeach(item) +endif() diff --git a/modules/system32/kdnet.dll b/modules/system32/kdnet.dll new file mode 100644 index 0000000000000..fa69419e6fd21 Binary files /dev/null and b/modules/system32/kdnet.dll differ diff --git a/modules/system32/kdstub.dll b/modules/system32/kdstub.dll new file mode 100644 index 0000000000000..b31a0e575eeda Binary files /dev/null and b/modules/system32/kdstub.dll differ diff --git a/modules/system32/kdstub_atheros.dll b/modules/system32/kdstub_atheros.dll new file mode 100644 index 0000000000000..4224b300f84ba Binary files /dev/null and b/modules/system32/kdstub_atheros.dll differ diff --git a/modules/system32/kdstub_broadcom.dll b/modules/system32/kdstub_broadcom.dll new file mode 100644 index 0000000000000..f72adbab52223 Binary files /dev/null and b/modules/system32/kdstub_broadcom.dll differ diff --git a/modules/system32/kdstub_realtek.dll b/modules/system32/kdstub_realtek.dll new file mode 100644 index 0000000000000..becfd43ed5e80 Binary files /dev/null and b/modules/system32/kdstub_realtek.dll differ