mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2026-06-21 03:55:02 -05:00
Linux: allow mounting NTFS volumes with ntfs3 (#1695)
* Linux: allow mounting volumes with ntfs3 * Linux: add ntfs3 preference for NTFS mounts * Linux: wrap ntfs3 preference help text * Add Linux ntfs3 mount preference * Remove Russian translation changes from ntfs3 PR * XML Translations: Add English fallback entries for ntfs3 preference --------- Co-authored-by: Mounir IDRASSI <mounir.idrassi@amcrypto.jp>
This commit is contained in:
@@ -24,6 +24,9 @@ namespace VeraCrypt
|
||||
TC_CLONE (CachePassword);
|
||||
TC_CLONE (FilesystemOptions);
|
||||
TC_CLONE (FilesystemType);
|
||||
#ifdef TC_LINUX
|
||||
TC_CLONE (MountNtfsWithNtfs3);
|
||||
#endif
|
||||
TC_CLONE_SHARED (KeyfileList, Keyfiles);
|
||||
TC_CLONE_SHARED (DirectoryPath, MountPoint);
|
||||
TC_CLONE (NoFilesystem);
|
||||
@@ -62,6 +65,9 @@ namespace VeraCrypt
|
||||
sr.Deserialize ("CachePassword", CachePassword);
|
||||
sr.Deserialize ("FilesystemOptions", FilesystemOptions);
|
||||
sr.Deserialize ("FilesystemType", FilesystemType);
|
||||
#ifdef TC_LINUX
|
||||
sr.Deserialize ("MountNtfsWithNtfs3", MountNtfsWithNtfs3);
|
||||
#endif
|
||||
|
||||
Keyfiles = Keyfile::DeserializeList (stream, "Keyfiles");
|
||||
|
||||
@@ -132,6 +138,9 @@ namespace VeraCrypt
|
||||
sr.Serialize ("CachePassword", CachePassword);
|
||||
sr.Serialize ("FilesystemOptions", FilesystemOptions);
|
||||
sr.Serialize ("FilesystemType", FilesystemType);
|
||||
#ifdef TC_LINUX
|
||||
sr.Serialize ("MountNtfsWithNtfs3", MountNtfsWithNtfs3);
|
||||
#endif
|
||||
Keyfile::SerializeList (stream, "Keyfiles", Keyfiles);
|
||||
|
||||
sr.Serialize ("MountPointNull", MountPoint == nullptr);
|
||||
|
||||
Reference in New Issue
Block a user