[REACTOS] HybridCD: Move the livecd.iso file into the livecd directory.

svn path=/trunk/; revision=66073

diff --git a/reactos/boot/bootdata/hybridcd.ini b/reactos/boot/bootdata/hybridcd.ini
index e8e53d5..d53ab95 100644 (file)
--- a/reactos/boot/bootdata/hybridcd.ini
+++ b/reactos/boot/bootdata/hybridcd.ini
@@ -61,14 +61,14 @@ Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /MINI
 [LiveCD_RamDisk]
 BootType=Windows2003
 SystemPath=ramdisk(0)\reactos
-Options=/MININT /RDPATH=livecd.iso /RDEXPORTASCD
+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.iso /RDEXPORTASCD
+Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD
 
 [LiveCD_RamDisk_Screen]
 BootType=Windows2003
 SystemPath=ramdisk(0)\reactos
-Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT /RDPATH=livecd.iso /RDEXPORTASCD
+Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD

diff --git a/reactos/cmake/CMakeMacros.cmake b/reactos/cmake/CMakeMacros.cmake
index da6a9bd..1c1f07c 100644 (file)
--- a/reactos/cmake/CMakeMacros.cmake
+++ b/reactos/cmake/CMakeMacros.cmake
@@ -419,7 +419,7 @@ function(create_iso_lists)
 
     add_cd_file(
         FILE ${CMAKE_CURRENT_BINARY_DIR}/livecd.iso
-        DESTINATION root
+        DESTINATION livecd
         FOR hybridcd)
 
     get_property(_filelist GLOBAL PROPERTY BOOTCD_FILE_LIST)