[REACTOS] All-in-one ReactOS BootCD with LiveCD RamDisk

It contains both the text-mode 1st-stage installer and the LiveCD
functionality with the 1st-stage GUI installer.
Our separate LiveCD ISOs become obsolete, and this completely remove
the need for the so-called "hybridcd" ISO.

Some details:

- the "hybridcd" build target is completely removed, since now the new
  BootCD *is* basically what we used to call "hybridcd";

- the "livecd" build target is kept so far (to minimize the code changes),
  but internally I start to refer to it as "LiveImage", and it is reduced
  to a minimum: currently a minimal non-bootable "liveimg.iso" is built
  in order to implement the "ReactOS Live in RAMDISK" functionality
  (we currently don't support other file formats apart from ISO and
  flat disk for a RAMDISK), while the "ReactOS Live" (non-RAMDISK) is
  implemented by adding to the BootCD file tree the files from the LiveImage.
  These files add two root directories, "Profiles" and "reactos" (which is
  the SystemRoot for the non-ramdisk LiveImage).

- The minimal text-mode ReactOS installation used during the 1st-stage
  text-mode installer, including USETUP itself and the executable for
  the 1st-stage GUI installer and the reactos.cab (installation source)
  are moved to the root directory called "i386" (ideally, one directory
  per architecture).

- the "bootcdregtest" target, i.e. the ISOs we feed our testbots with,
  are left untouched, i.e. they are only constituted of the 1st-stage
  text-mode installation, in the root directory named "reactos".

More details will be presented in a subsequent mail to the ros-dev mailing list.

svn path=/branches/setup_improvements/; revision=75273
This commit is contained in:
Hermès Bélusca-Maïto 2017-07-03 17:53:23 +00:00
parent 81b3f0afdc
commit 4a6bd7a492
No known key found for this signature in database
GPG Key ID: 3B2539C65E7B93D0
2 changed files with 33 additions and 11 deletions

View File

@ -7,18 +7,23 @@ TitleText=ReactOS Setup & Live BootCD
MinimalUI=Yes
[Operating Systems]
Setup="Setup"
Setup="ReactOS Setup (Text Mode)"
Setup_Debug="Setup (Debug)"
Setup_Aacpi="Setup ACPI APIC (Debug)"
Setup_Screen="Setup (Screen)"
;;;;
LiveCD="LiveCD"
LiveCD_Debug="LiveCD (Debug)"
LiveCD="ReactOS Setup (Graphics Mode) & Live"
LiveCD_Debug="ReactOS Live (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_VBoxDebug="ReactOS Live (VBox Debug)"
LiveCD_Screen="ReactOS Live (Screen)"
; LiveCD_LogFile="ReactOS Live (Log file)"
LiveCD_RamDisk="ReactOS Setup (Graphics Mode) & Live in RAM"
LiveCD_RamDisk_Debug="ReactOS Live in RAM (Debug)"
LiveCD_RamDisk_Screen="ReactOS Live in RAM (Screen)"
;;;;
HddBoot="Boot from first hard disk"
[Setup]
BootType=ReactOSSetup
@ -66,7 +71,26 @@ BootType=Windows2003
SystemPath=\reactos
Options=/DEBUG /DEBUGPORT=SCREEN /SOS /FASTDETECT /MININT
[LiveCD_LogFile]
; [LiveCD_LogFile]
; BootType=Windows2003
; SystemPath=\reactos
; Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /FASTDETECT /MININT
[LiveCD_RamDisk]
BootType=Windows2003
SystemPath=\reactos
Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /FASTDETECT /MININT
SystemPath=ramdisk(0)\reactos
Options=/FASTDETECT /MININT /RDPATH=liveimg.iso /RDEXPORTASCD
[LiveCD_RamDisk_Debug]
BootType=Windows2003
SystemPath=ramdisk(0)\reactos
Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /FASTDETECT /MININT /RDPATH=liveimg.iso /RDEXPORTASCD
[LiveCD_RamDisk_Screen]
BootType=Windows2003
SystemPath=ramdisk(0)\reactos
Options=/DEBUG /DEBUGPORT=SCREEN /SOS /FASTDETECT /MININT /RDPATH=liveimg.iso /RDEXPORTASCD
[HddBoot]
BootType=Drive
BootDrive=hd0

View File

@ -396,14 +396,12 @@ function(create_iso_lists)
DESTINATION reactos
NO_CAB FOR bootcd regtest)
if(FALSE) ## Disabled until we want a RAMDISK ISO
# Add the LiveImage into the BootCD
add_cd_file(
TARGET livecd
FILE ${CMAKE_CURRENT_BINARY_DIR}/liveimg.iso
DESTINATION root
NO_CAB FOR bootcd)
endif()
# Write the LiveImage file list
get_property(_filelist GLOBAL PROPERTY LIVECD_FILE_LIST)