diff options
author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2024-06-22 01:13:20 +0200 |
---|---|---|
committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2024-06-22 01:13:20 +0200 |
commit | edde1d45f6de3e71b585b92e0e06d7499735c238 (patch) | |
tree | a3caa522b1e21e1e337bea684fc1032d2e325e7a /src/Core/Unix/MacOSX | |
parent | 8b01b533cfeafc989137c202af61c83f63c5f531 (diff) | |
download | VeraCrypt-edde1d45f6de3e71b585b92e0e06d7499735c238.tar.gz VeraCrypt-edde1d45f6de3e71b585b92e0e06d7499735c238.zip |
MacOSX: Add for using FUSE-T instead of MacFUSE
The build script build_veracrypt_macosx.h now accepts the argument -f to enable fuse-t support.
It is also possible to set the environment variable VC_OSX_FUSET to 1 for FUSE-T support.
A change was done in CoreUnix::GetMountedVolumes to add a waiting loop for control file to be accessible because when using FUSE-T there always a delay before control file can be serialized.
Diffstat (limited to 'src/Core/Unix/MacOSX')
-rw-r--r-- | src/Core/Unix/MacOSX/CoreMacOSX.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Core/Unix/MacOSX/CoreMacOSX.cpp b/src/Core/Unix/MacOSX/CoreMacOSX.cpp index dde0d949..cfd34072 100644 --- a/src/Core/Unix/MacOSX/CoreMacOSX.cpp +++ b/src/Core/Unix/MacOSX/CoreMacOSX.cpp @@ -119,6 +119,7 @@ namespace VeraCrypt void CoreMacOSX::MountAuxVolumeImage (const DirectoryPath &auxMountPoint, const MountOptions &options) const { +#ifndef VC_MACOSX_FUSET // Check FUSE version char fuseVersionString[MAXHOSTNAMELEN + 1] = { 0 }; size_t fuseVersionStringLength = MAXHOSTNAMELEN; @@ -153,7 +154,7 @@ namespace VeraCrypt if (fuseVersionMajor < 2 || (fuseVersionMajor == 2 && fuseVersionMinor < 5)) throw HigherFuseVersionRequired (SRC_POS); - +#endif // Mount volume image string volImage = string (auxMountPoint) + FuseService::GetVolumeImagePath(); |