Remove file map disk support by default, it's not used anyway, and we'll use layers for CD anyway. Doesn't spare that many bytes though...
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32110 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -19,6 +19,7 @@ UsePrivateHeaders shared storage ;
|
|||||||
|
|
||||||
BOOT_SUPPORT_FILE_SYSTEM_BFS
|
BOOT_SUPPORT_FILE_SYSTEM_BFS
|
||||||
BOOT_SUPPORT_FILE_SYSTEM_TARFS
|
BOOT_SUPPORT_FILE_SYSTEM_TARFS
|
||||||
|
#BOOT_SUPPORT_FILE_MAP_DISK
|
||||||
;
|
;
|
||||||
|
|
||||||
# Add architecture specific partition/file system modules
|
# Add architecture specific partition/file system modules
|
||||||
@@ -51,7 +52,6 @@ UsePrivateHeaders shared storage ;
|
|||||||
KernelStaticLibrary boot_loader :
|
KernelStaticLibrary boot_loader :
|
||||||
main.cpp
|
main.cpp
|
||||||
vfs.cpp
|
vfs.cpp
|
||||||
FileMapDisk.cpp
|
|
||||||
RootFileSystem.cpp
|
RootFileSystem.cpp
|
||||||
partitions.cpp
|
partitions.cpp
|
||||||
heap.cpp
|
heap.cpp
|
||||||
@@ -77,6 +77,7 @@ KernelStaticLibrary boot_loader :
|
|||||||
# so that only the ones that are used will be included.
|
# so that only the ones that are used will be included.
|
||||||
|
|
||||||
KernelStaticLibrary boot_partitions :
|
KernelStaticLibrary boot_partitions :
|
||||||
|
FileMapDisk.cpp
|
||||||
amiga_rdb.cpp
|
amiga_rdb.cpp
|
||||||
apple.cpp
|
apple.cpp
|
||||||
efi_gpt.cpp
|
efi_gpt.cpp
|
||||||
|
|||||||
@@ -222,7 +222,6 @@ Partition::AddChild()
|
|||||||
status_t
|
status_t
|
||||||
Partition::_Mount(file_system_module_info *module, Directory **_fileSystem)
|
Partition::_Mount(file_system_module_info *module, Directory **_fileSystem)
|
||||||
{
|
{
|
||||||
static int fileMapDiskDepth = 0;
|
|
||||||
TRACE(("%p Partition::_Mount check for file_system: %s\n",
|
TRACE(("%p Partition::_Mount check for file_system: %s\n",
|
||||||
this, module->pretty_name));
|
this, module->pretty_name));
|
||||||
|
|
||||||
@@ -237,6 +236,8 @@ Partition::_Mount(file_system_module_info *module, Directory **_fileSystem)
|
|||||||
|
|
||||||
fIsFileSystem = true;
|
fIsFileSystem = true;
|
||||||
|
|
||||||
|
#ifdef BOOT_SUPPORT_FILE_MAP_DISK
|
||||||
|
static int fileMapDiskDepth = 0;
|
||||||
// if we aren't already mounting an image
|
// if we aren't already mounting an image
|
||||||
if (!fileMapDiskDepth++) {
|
if (!fileMapDiskDepth++) {
|
||||||
// see if it contains an image file we could mount in turn
|
// see if it contains an image file we could mount in turn
|
||||||
@@ -248,6 +249,7 @@ Partition::_Mount(file_system_module_info *module, Directory **_fileSystem)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
fileMapDiskDepth--;
|
fileMapDiskDepth--;
|
||||||
|
#endif
|
||||||
|
|
||||||
return B_OK;
|
return B_OK;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user