mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2026-06-21 03:55:02 -05:00
Linux: refine in-kernel NTFS driver selection
Keep the NTFS kernel-driver option as a generic in-kernel NTFS path rather than an ntfs3-specific path. Add --filesystem=kernel-ntfs and -m kernelntfs routes that select a registered or loadable kernel NTFS driver and mount with -i so mount.ntfs/ntfs-3g helpers are not invoked. Preserve --filesystem=ntfs3 as a literal pin to the ntfs3 driver. Treat both ntfs3 and kernel-ntfs as mount-only selectors; volume creation continues to use filesystem type NTFS. The preference and -m kernelntfs path only select an in-kernel NTFS driver when no explicit filesystem type was supplied and blkid detects NTFS. Treat ntfs as the preferred in-kernel driver on Linux 7.1 and later, where the upstream read/write driver is expected. On earlier kernels, select ntfs only when module metadata identifies the standalone read/write driver and /sys/module confirms it loaded, avoiding ntfs3 read-only ntfs compatibility registrations. Fall back to ntfs3 otherwise, and report a generic kernel-driver error if neither supported driver is available or loadable. Rename the internal preference/config field to MountNtfsWithKernelDriver, migrate the old MountNtfsWithNtfs3 preference key, and update UI strings, CLI help, documentation, release notes, and translation placeholders accordingly. Reference: https://github.com/veracrypt/VeraCrypt/issues/1735
This commit is contained in:
@@ -25,7 +25,7 @@ namespace VeraCrypt
|
||||
TC_CLONE (FilesystemOptions);
|
||||
TC_CLONE (FilesystemType);
|
||||
#ifdef TC_LINUX
|
||||
TC_CLONE (MountNtfsWithNtfs3);
|
||||
TC_CLONE (MountNtfsWithKernelDriver);
|
||||
#endif
|
||||
TC_CLONE_SHARED (KeyfileList, Keyfiles);
|
||||
TC_CLONE_SHARED (DirectoryPath, MountPoint);
|
||||
@@ -66,7 +66,7 @@ namespace VeraCrypt
|
||||
sr.Deserialize ("FilesystemOptions", FilesystemOptions);
|
||||
sr.Deserialize ("FilesystemType", FilesystemType);
|
||||
#ifdef TC_LINUX
|
||||
sr.Deserialize ("MountNtfsWithNtfs3", MountNtfsWithNtfs3);
|
||||
sr.Deserialize ("MountNtfsWithKernelDriver", MountNtfsWithKernelDriver);
|
||||
#endif
|
||||
|
||||
Keyfiles = Keyfile::DeserializeList (stream, "Keyfiles");
|
||||
@@ -139,7 +139,7 @@ namespace VeraCrypt
|
||||
sr.Serialize ("FilesystemOptions", FilesystemOptions);
|
||||
sr.Serialize ("FilesystemType", FilesystemType);
|
||||
#ifdef TC_LINUX
|
||||
sr.Serialize ("MountNtfsWithNtfs3", MountNtfsWithNtfs3);
|
||||
sr.Serialize ("MountNtfsWithKernelDriver", MountNtfsWithKernelDriver);
|
||||
#endif
|
||||
Keyfile::SerializeList (stream, "Keyfiles", Keyfiles);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user