Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 04:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.15][SETUP] Disable BTRFS

Browse source 
BTRFS installs are no longer stable. Disable BTRFS install option for a less confusing user experience.

This patch was developed specifically for 0.4.15 and should not be ported to the master branch at this time.
This commit is contained in:
Carl J. Bialorucki 2025-03-14 20:24:37 -06:00
parent bd270f07f3
commit 079003d972
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
base/setup/lib/fsutil.c
View file

@ -22,7 +22,7 @@
#include "fsutil.h" #include "fsutil.h"
#include <fslib/vfatlib.h> #include <fslib/vfatlib.h>
#include <fslib/btrfslib.h> // #include <fslib/btrfslib.h>
// #include <fslib/ext2lib.h> // #include <fslib/ext2lib.h>
// #include <fslib/ntfslib.h> // #include <fslib/ntfslib.h>
@ -165,9 +165,7 @@ static FILE_SYSTEM RegisteredFileSystems[] =
#if 0 #if 0
{ L"FATX" , VfatxFormat, VfatxChkdsk }, { L"FATX" , VfatxFormat, VfatxChkdsk },
{ L"NTFS" , NtfsFormat, NtfsChkdsk }, { L"NTFS" , NtfsFormat, NtfsChkdsk },
#endif
{ L"BTRFS", BtrfsFormat, BtrfsChkdsk }, { L"BTRFS", BtrfsFormat, BtrfsChkdsk },
#if 0
{ L"EXT2" , Ext2Format, Ext2Chkdsk }, { L"EXT2" , Ext2Format, Ext2Chkdsk },
{ L"EXT3" , Ext2Format, Ext2Chkdsk }, { L"EXT3" , Ext2Format, Ext2Chkdsk },
{ L"EXT4" , Ext2Format, Ext2Chkdsk }, { L"EXT4" , Ext2Format, Ext2Chkdsk },

4
base/setup/lib/utils/partlist.c
View file

@ -3122,9 +3122,9 @@ IsSupportedActivePartition(
/* NOTE: Please keep in sync with the RegisteredFileSystems list! */ /* NOTE: Please keep in sync with the RegisteredFileSystems list! */
if (wcsicmp(Volume->Info.FileSystem, L"FAT") == 0 || if (wcsicmp(Volume->Info.FileSystem, L"FAT") == 0 ||
wcsicmp(Volume->Info.FileSystem, L"FAT32") == 0 || wcsicmp(Volume->Info.FileSystem, L"FAT32") == 0)
// wcsicmp(Volume->Info.FileSystem, L"NTFS") == 0 || // wcsicmp(Volume->Info.FileSystem, L"NTFS") == 0 ||
wcsicmp(Volume->Info.FileSystem, L"BTRFS") == 0) // wcsicmp(Volume->Info.FileSystem, L"BTRFS") == 0)
{ {
return TRUE; return TRUE;
} }

2
base/setup/reactos/CMakeLists.txt
View file

@ -19,7 +19,7 @@ add_rc_deps(reactos.rc ${reactos_rc_deps})
add_executable(reactos ${SOURCE} reactos.rc) add_executable(reactos ${SOURCE} reactos.rc)
add_pch(reactos reactos.h SOURCE) add_pch(reactos reactos.h SOURCE)
set_module_type(reactos win32gui UNICODE) set_module_type(reactos win32gui UNICODE)
target_link_libraries(reactos uuid setuplib ext2lib vfatlib btrfslib) target_link_libraries(reactos uuid setuplib ext2lib vfatlib)
target_link_libraries(reactos zlib_solo) ## We use USETUP's cabinet implementation target_link_libraries(reactos zlib_solo) ## We use USETUP's cabinet implementation
add_importlibs(reactos advapi32 gdi32 user32 comctl32 shlwapi setupapi msvcrt kernel32 ntdll) add_importlibs(reactos advapi32 gdi32 user32 comctl32 shlwapi setupapi msvcrt kernel32 ntdll)
add_cd_file(TARGET reactos DESTINATION reactos NO_CAB FOR bootcd) add_cd_file(TARGET reactos DESTINATION reactos NO_CAB FOR bootcd)

2
base/setup/usetup/CMakeLists.txt
View file

@ -35,6 +35,6 @@ endif()
add_pch(usetup usetup.h SOURCE) add_pch(usetup usetup.h SOURCE)
set_module_type(usetup nativecui) set_module_type(usetup nativecui)
target_link_libraries(usetup inflib setuplib zlib_solo ext2lib vfatlib btrfslib chkstk) target_link_libraries(usetup inflib setuplib zlib_solo ext2lib vfatlib chkstk)
add_importlibs(usetup ntdll) add_importlibs(usetup ntdll)
add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest) add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest)