From 5a650f6ba50a270faf37c36f8054b931dd9b4272 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 18 Dec 2017 08:44:24 +0100 Subject: [PATCH] [FS] During 1st stage, disable any FS we don't support install to in order to let RawFS these volumes. This avoids bloated setup and avoids potential bugs in 3rd party drivers. This is following 806cd1. --- boot/bootdata/txtsetup.sif | 4 ---- drivers/filesystems/ext2/CMakeLists.txt | 2 +- drivers/filesystems/ffs/CMakeLists.txt | 2 +- drivers/filesystems/reiserfs/CMakeLists.txt | 2 +- drivers/filesystems/udfs/CMakeLists.txt | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 822c19c8c8d..7a86befd280 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -57,7 +57,6 @@ scsiport.sys=,,,,,,x,,,,,,4 storport.sys=,,,,,,x,,,,,,4 fastfat.sys=,,,,,,x,,,,,,4 ramdisk.sys=,,,,,,x,,,,,,4 -ext2fs.sys=,,,,,,x,,,,,,4 classpnp.sys=,,,,,,,,,,,,4 pciide.sys=,,,,,,,,,,,,4 pciidex.sys=,,,,,,,,,,,,4 @@ -68,9 +67,6 @@ ntdll.dll=,,,,,,,,,,,,2 wmilib.sys=,,,,,,,,,,,,4 ksecdd.sys=,,,,,,,,,,,,4 mountmgr.sys=,,,,,,x,,,,,,4 -reiserfs.sys=,,,,,,x,,,,,,4 -ffs.sys=,,,,,,x,,,,,,4 -udfs.sys=,,,,,,x,,,,,,4 [SystemPartitionFiles] diff --git a/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt index 6d0bdb7d013..94b077b0c45 100644 --- a/drivers/filesystems/ext2/CMakeLists.txt +++ b/drivers/filesystems/ext2/CMakeLists.txt @@ -118,4 +118,4 @@ if(NOT USE_CLANG_CL) add_pch(ext2fs inc/ext2fs.h SOURCE) endif() -add_cd_file(TARGET ext2fs DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET ext2fs DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/filesystems/ffs/CMakeLists.txt b/drivers/filesystems/ffs/CMakeLists.txt index 8138a15a5a9..6f371875b2d 100644 --- a/drivers/filesystems/ffs/CMakeLists.txt +++ b/drivers/filesystems/ffs/CMakeLists.txt @@ -45,5 +45,5 @@ set_module_type(ffs kernelmodedriver) target_link_libraries(ffs memcmp ${PSEH_LIB}) add_importlibs(ffs ntoskrnl hal) add_pch(ffs inc/ffsdrv.h SOURCE) -add_cd_file(TARGET ffs DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET ffs DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/filesystems/reiserfs/CMakeLists.txt b/drivers/filesystems/reiserfs/CMakeLists.txt index 7990886489b..95d70eaf016 100644 --- a/drivers/filesystems/reiserfs/CMakeLists.txt +++ b/drivers/filesystems/reiserfs/CMakeLists.txt @@ -95,4 +95,4 @@ add_definitions(-D__KERNEL__) set_module_type(reiserfs kernelmodedriver) add_importlibs(reiserfs ntoskrnl hal) add_pch(reiserfs inc/rfsd.h SOURCE) -add_cd_file(TARGET reiserfs DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET reiserfs DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/filesystems/udfs/CMakeLists.txt b/drivers/filesystems/udfs/CMakeLists.txt index 8b5df85fcf6..8bb85aa627b 100644 --- a/drivers/filesystems/udfs/CMakeLists.txt +++ b/drivers/filesystems/udfs/CMakeLists.txt @@ -60,5 +60,5 @@ set_module_type(udfs kernelmodedriver) target_link_libraries(udfs ${PSEH_LIB}) add_importlibs(udfs ntoskrnl hal) add_pch(udfs udffs.h SOURCE) -add_cd_file(TARGET udfs DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET udfs DESTINATION reactos/system32/drivers FOR all) add_registry_inf(udfs_reg.inf)