@@ -1473,6 +1473,8 @@
Använd inte kärnkryptografiska tjänster
Filsystem
Monteringsalternativ:
+ Mount NTFS volumes with the Linux kernel ntfs3 driver
+ Linux only. When enabled, VeraCrypt probes the decrypted virtual device with blkid -p and mounts detected NTFS filesystems with ntfs3 instead of the default NTFS backend. If NTFS detection fails, VeraCrypt uses the normal automatic filesystem selection. If ntfs3 is unavailable or blocked by the distribution, mounting may fail. This opt-in option can avoid suspend or hibernate hangs caused by frozen user-space FUSE filesystems.
Stöd för flera plattformar
Jag kommer att montera volymen på andra plattformar
Välj det här alternativet om du behöver använda volymen på andra plattformar.
diff --git a/Translations/Language.th.xml b/Translations/Language.th.xml
index 48f0a6201a..92bf7dd341 100644
--- a/Translations/Language.th.xml
+++ b/Translations/Language.th.xml
@@ -1474,6 +1474,8 @@
ไม่ใช้บริการเข้ารหัสเคอร์เนล
ระบบไฟล์
ตัวเลือกการติดตั้ง:
+ Mount NTFS volumes with the Linux kernel ntfs3 driver
+ Linux only. When enabled, VeraCrypt probes the decrypted virtual device with blkid -p and mounts detected NTFS filesystems with ntfs3 instead of the default NTFS backend. If NTFS detection fails, VeraCrypt uses the normal automatic filesystem selection. If ntfs3 is unavailable or blocked by the distribution, mounting may fail. This opt-in option can avoid suspend or hibernate hangs caused by frozen user-space FUSE filesystems.
การสนับสนุนข้ามแพลตฟอร์ม
ฉันจะติดตั้งปริมาณบนแพลตฟอร์มอื่น
เลือกตัวเลือกนี้ถ้าคุณต้องการใช้ปริมาณบนแพลตฟอร์มอื่น.
diff --git a/Translations/Language.tr.xml b/Translations/Language.tr.xml
index 70c79100cc..976a018036 100644
--- a/Translations/Language.tr.xml
+++ b/Translations/Language.tr.xml
@@ -1473,6 +1473,8 @@
Çekirdek şifreleme hizmetleri kullanılmasın
Dosya sistemi
Bağlama seçenekleri:
+ Mount NTFS volumes with the Linux kernel ntfs3 driver
+ Linux only. When enabled, VeraCrypt probes the decrypted virtual device with blkid -p and mounts detected NTFS filesystems with ntfs3 instead of the default NTFS backend. If NTFS detection fails, VeraCrypt uses the normal automatic filesystem selection. If ntfs3 is unavailable or blocked by the distribution, mounting may fail. This opt-in option can avoid suspend or hibernate hangs caused by frozen user-space FUSE filesystems.
Platformlar arası destek
Birimi diğer platformlara bağlayacağım
Birimi başka platformlarda kullanmanız gerekiyorsa bu seçeneği işaretleyin.
diff --git a/Translations/Language.uk.xml b/Translations/Language.uk.xml
index 0944d12f20..1e51cee068 100644
--- a/Translations/Language.uk.xml
+++ b/Translations/Language.uk.xml
@@ -1473,6 +1473,8 @@
Не використовувати криптографічні сервіси ядра
Файлова система
Опції монтажу:
+ Mount NTFS volumes with the Linux kernel ntfs3 driver
+ Linux only. When enabled, VeraCrypt probes the decrypted virtual device with blkid -p and mounts detected NTFS filesystems with ntfs3 instead of the default NTFS backend. If NTFS detection fails, VeraCrypt uses the normal automatic filesystem selection. If ntfs3 is unavailable or blocked by the distribution, mounting may fail. This opt-in option can avoid suspend or hibernate hangs caused by frozen user-space FUSE filesystems.
Кроссплатформна підтримка
Я буду монтувати том на інших платформах
Увімкніть цей параметр, якщо вам потрібно використовувати том на інших платформах.
diff --git a/Translations/Language.uz.xml b/Translations/Language.uz.xml
index b7ca233431..50a386a6ee 100644
--- a/Translations/Language.uz.xml
+++ b/Translations/Language.uz.xml
@@ -1473,6 +1473,8 @@
Do not use kernel cryptographic services
Filesystem
Mount options:
+ Mount NTFS volumes with the Linux kernel ntfs3 driver
+ Linux only. When enabled, VeraCrypt probes the decrypted virtual device with blkid -p and mounts detected NTFS filesystems with ntfs3 instead of the default NTFS backend. If NTFS detection fails, VeraCrypt uses the normal automatic filesystem selection. If ntfs3 is unavailable or blocked by the distribution, mounting may fail. This opt-in option can avoid suspend or hibernate hangs caused by frozen user-space FUSE filesystems.
Cross-Platform Support
I will mount the volume on other platforms
Choose this option if you need to use the volume on other platforms.
diff --git a/Translations/Language.vi.xml b/Translations/Language.vi.xml
index 7b564b6fc6..6b62f32060 100644
--- a/Translations/Language.vi.xml
+++ b/Translations/Language.vi.xml
@@ -1473,6 +1473,8 @@
Do not use kernel cryptographic services
Filesystem
Mount options:
+ Mount NTFS volumes with the Linux kernel ntfs3 driver
+ Linux only. When enabled, VeraCrypt probes the decrypted virtual device with blkid -p and mounts detected NTFS filesystems with ntfs3 instead of the default NTFS backend. If NTFS detection fails, VeraCrypt uses the normal automatic filesystem selection. If ntfs3 is unavailable or blocked by the distribution, mounting may fail. This opt-in option can avoid suspend or hibernate hangs caused by frozen user-space FUSE filesystems.
Cross-Platform Support
I will mount the volume on other platforms
Choose this option if you need to use the volume on other platforms.
diff --git a/Translations/Language.zh-cn.xml b/Translations/Language.zh-cn.xml
index 44f20562fb..8721f7eac0 100644
--- a/Translations/Language.zh-cn.xml
+++ b/Translations/Language.zh-cn.xml
@@ -1474,6 +1474,8 @@
不要使用内核加密服务
文件系统
装载选项：
+ Mount NTFS volumes with the Linux kernel ntfs3 driver
+ Linux only. When enabled, VeraCrypt probes the decrypted virtual device with blkid -p and mounts detected NTFS filesystems with ntfs3 instead of the default NTFS backend. If NTFS detection fails, VeraCrypt uses the normal automatic filesystem selection. If ntfs3 is unavailable or blocked by the distribution, mounting may fail. This opt-in option can avoid suspend or hibernate hangs caused by frozen user-space FUSE filesystems.
跨平台支持
我将在其它平台上装载该卷
如果需要在其它平台上使用该卷，请选择此选项。
diff --git a/Translations/Language.zh-hk.xml b/Translations/Language.zh-hk.xml
index fd96901529..8def597dcd 100644
--- a/Translations/Language.zh-hk.xml
+++ b/Translations/Language.zh-hk.xml
@@ -1473,6 +1473,8 @@
不要使用系統核心加密服務
檔案系統
掛載選項:
+ Mount NTFS volumes with the Linux kernel ntfs3 driver
+ Linux only. When enabled, VeraCrypt probes the decrypted virtual device with blkid -p and mounts detected NTFS filesystems with ntfs3 instead of the default NTFS backend. If NTFS detection fails, VeraCrypt uses the normal automatic filesystem selection. If ntfs3 is unavailable or blocked by the distribution, mounting may fail. This opt-in option can avoid suspend or hibernate hangs caused by frozen user-space FUSE filesystems.
跨平台支援
我將會在其他平台掛載這個加密區
如你需要於其他平台上掛載此加密區請選取此選項。
diff --git a/Translations/Language.zh-tw.xml b/Translations/Language.zh-tw.xml
index 723e5c0dca..6e323dc6c9 100644
--- a/Translations/Language.zh-tw.xml
+++ b/Translations/Language.zh-tw.xml
@@ -1473,6 +1473,8 @@
Do not use kernel cryptographic services
Filesystem
Mount options:
+ Mount NTFS volumes with the Linux kernel ntfs3 driver
+ Linux only. When enabled, VeraCrypt probes the decrypted virtual device with blkid -p and mounts detected NTFS filesystems with ntfs3 instead of the default NTFS backend. If NTFS detection fails, VeraCrypt uses the normal automatic filesystem selection. If ntfs3 is unavailable or blocked by the distribution, mounting may fail. This opt-in option can avoid suspend or hibernate hangs caused by frozen user-space FUSE filesystems.
Cross-Platform Support
I will mount the volume on other platforms
Choose this option if you need to use the volume on other platforms.
diff --git a/doc/html/en/Mounting VeraCrypt Volumes.html b/doc/html/en/Mounting VeraCrypt Volumes.html
index 4a48fc26ce..d8f010de16 100644
--- a/doc/html/en/Mounting VeraCrypt Volumes.html
+++ b/doc/html/en/Mounting VeraCrypt Volumes.html
@@ -53,6 +53,7 @@ Mount Options
Default mount options can be configured in the main program preferences (Settings -> Preferences).
Filesystem mount options under Linux
Under Linux, the Mount Options dialog also contains a Mount options field for filesystem mount options. The value entered there is passed to the system mount command with -o when the filesystem inside the VeraCrypt volume is mounted. For example, entering noatime prevents Linux from updating inode access times on filesystems that support this option, reducing metadata writes caused only by file access. Multiple options can be specified as a comma-separated list, for example noatime,nosuid,nodev. Unsupported options are handled by the operating system and may cause mounting to fail.
+The Linux preference Mount NTFS volumes with the Linux kernel ntfs3 driver is disabled by default. When enabled, VeraCrypt probes the decrypted virtual device with blkid -p and mounts detected NTFS filesystems with the in-kernel ntfs3 driver instead of the default NTFS backend. If NTFS detection fails, VeraCrypt uses the normal automatic filesystem selection. If ntfs3 is unavailable or blocked by the Linux distribution, mounting may fail. This opt-in option can help on systems where suspend or hibernation can hang if user-space FUSE filesystems such as ntfs-3g/fuseblk are frozen while the kernel is syncing filesystems. The actual mounted filesystem type can be checked with findmnt.
The command line equivalent is veracrypt --fs-options=noatime <volume> <mountpoint>.
Mount volume as read-only
When checked, it will not be possible to write any data to the mounted volume.
diff --git a/src/Common/Language.xml b/src/Common/Language.xml
index 0e7271b7b8..e7a6f16de8 100644
--- a/src/Common/Language.xml
+++ b/src/Common/Language.xml
@@ -1473,6 +1473,8 @@
Do not use kernel cryptographic services
Filesystem
Mount options:
+ Mount NTFS volumes with the Linux kernel ntfs3 driver
+ Linux only. When enabled, VeraCrypt probes the decrypted virtual device with blkid -p and mounts detected NTFS filesystems with ntfs3 instead of the default NTFS backend. If NTFS detection fails, VeraCrypt uses the normal automatic filesystem selection. If ntfs3 is unavailable or blocked by the distribution, mounting may fail. This opt-in option can avoid suspend or hibernate hangs caused by frozen user-space FUSE filesystems.
Cross-Platform Support
I will mount the volume on other platforms
Choose this option if you need to use the volume on other platforms.
diff --git a/src/Core/MountOptions.cpp b/src/Core/MountOptions.cpp
index 94fda9e459..5ba782959c 100644
--- a/src/Core/MountOptions.cpp
+++ b/src/Core/MountOptions.cpp
@@ -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);
diff --git a/src/Core/MountOptions.h b/src/Core/MountOptions.h
index c6085401cd..40546dd1e6 100644
--- a/src/Core/MountOptions.h
+++ b/src/Core/MountOptions.h
@@ -26,6 +26,9 @@ namespace VeraCrypt
MountOptions ()
:
CachePassword (false),
+#ifdef TC_LINUX
+ MountNtfsWithNtfs3 (false),
+#endif
NoFilesystem (false),
NoHardwareCrypto (false),
NoKernelCrypto (false),
@@ -51,6 +54,9 @@ namespace VeraCrypt
bool CachePassword;
wstring FilesystemOptions;
wstring FilesystemType;
+#ifdef TC_LINUX
+ bool MountNtfsWithNtfs3;
+#endif
shared_ptr Keyfiles;
shared_ptr MountPoint;
bool NoFilesystem;
diff --git a/src/Core/Unix/CoreUnix.cpp b/src/Core/Unix/CoreUnix.cpp
index 86878627e8..68d9ecb044 100644
--- a/src/Core/Unix/CoreUnix.cpp
+++ b/src/Core/Unix/CoreUnix.cpp
@@ -566,6 +566,29 @@ namespace VeraCrypt
return GetMountedFilesystems (DevicePath(), mountPoint).size() == 0;
}
+#ifdef TC_LINUX
+ string CoreUnix::DetectFilesystemType (const DevicePath &devicePath) const
+ {
+ list args;
+ args.push_back ("-p");
+ args.push_back ("-o");
+ args.push_back ("value");
+ args.push_back ("-s");
+ args.push_back ("TYPE");
+ args.push_back ("--");
+ args.push_back (devicePath);
+
+ try
+ {
+ return StringConverter::ToLower (StringConverter::Trim (Process::Execute ("blkid", args, 2000)));
+ }
+ catch (...)
+ {
+ return string();
+ }
+ }
+#endif
+
void CoreUnix::MountFilesystem (const DevicePath &devicePath, const DirectoryPath &mountPoint, const string &filesystemType, bool readOnly, const string &systemMountOptions) const
{
if (GetMountedFilesystems (DevicePath(), mountPoint).size() > 0)
@@ -914,8 +937,18 @@ namespace VeraCrypt
if (!options.NoFilesystem && options.MountPoint && !options.MountPoint->IsEmpty())
{
+ wstring filesystemType = options.FilesystemType;
+
+#ifdef TC_LINUX
+ if (options.MountNtfsWithNtfs3 && filesystemType.empty()
+ && DetectFilesystemType (loopDev) == "ntfs")
+ {
+ filesystemType = L"ntfs3";
+ }
+#endif
+
MountFilesystem (loopDev, *options.MountPoint,
- StringConverter::ToSingle (options.FilesystemType),
+ StringConverter::ToSingle (filesystemType),
options.Protection == VolumeProtection::ReadOnly,
StringConverter::ToSingle (options.FilesystemOptions));
}
diff --git a/src/Core/Unix/CoreUnix.h b/src/Core/Unix/CoreUnix.h
index fefd3ac333..b526194971 100644
--- a/src/Core/Unix/CoreUnix.h
+++ b/src/Core/Unix/CoreUnix.h
@@ -65,6 +65,9 @@ namespace VeraCrypt
virtual void MountFilesystem (const DevicePath &devicePath, const DirectoryPath &mountPoint, const string &filesystemType, bool readOnly, const string &systemMountOptions) const;
virtual DevicePath MountAuxVolumeImage (const DirectoryPath &auxMountPoint, const MountOptions &options) const;
virtual void MountVolumeNative (shared_ptr volume, MountOptions &options, const DirectoryPath &auxMountPoint) const { throw NotApplicable (SRC_POS); }
+#ifdef TC_LINUX
+ string DetectFilesystemType (const DevicePath &devicePath) const;
+#endif
private:
CoreUnix (const CoreUnix &);
diff --git a/src/Core/Unix/Linux/CoreLinux.cpp b/src/Core/Unix/Linux/CoreLinux.cpp
index f54045cc43..df1f80334f 100644
--- a/src/Core/Unix/Linux/CoreLinux.cpp
+++ b/src/Core/Unix/Linux/CoreLinux.cpp
@@ -455,8 +455,16 @@ namespace VeraCrypt
// Mount filesystem
if (!options.NoFilesystem && options.MountPoint && !options.MountPoint->IsEmpty())
{
+ wstring filesystemType = options.FilesystemType;
+
+ if (options.MountNtfsWithNtfs3 && filesystemType.empty()
+ && DetectFilesystemType (nativeDevPath) == "ntfs")
+ {
+ filesystemType = L"ntfs3";
+ }
+
MountFilesystem (nativeDevPath, *options.MountPoint,
- StringConverter::ToSingle (options.FilesystemType),
+ StringConverter::ToSingle (filesystemType),
options.Protection == VolumeProtection::ReadOnly,
StringConverter::ToSingle (options.FilesystemOptions));
diff --git a/src/Main/CommandLineInterface.cpp b/src/Main/CommandLineInterface.cpp
index 74c1a676c7..2b1018fb98 100644
--- a/src/Main/CommandLineInterface.cpp
+++ b/src/Main/CommandLineInterface.cpp
@@ -361,6 +361,11 @@ namespace VeraCrypt
ArgFilesystem = VolumeCreationOptions::FilesystemType::Ext4;
else if (str.IsSameAs (L"NTFS", false))
ArgFilesystem = VolumeCreationOptions::FilesystemType::NTFS;
+ else if (str.IsSameAs (L"ntfs3", false))
+ {
+ ArgMountOptions.FilesystemType = L"ntfs3";
+ ArgFilesystem = VolumeCreationOptions::FilesystemType::NTFS;
+ }
else if (str.IsSameAs (L"exFAT", false))
ArgFilesystem = VolumeCreationOptions::FilesystemType::exFAT;
else if (str.IsSameAs (L"Btrfs", false))
diff --git a/src/Main/Forms/Forms.h b/src/Main/Forms/Forms.h
index 70a8c230b6..42f9b8f83b 100644
--- a/src/Main/Forms/Forms.h
+++ b/src/Main/Forms/Forms.h
@@ -1142,4 +1142,3 @@ namespace VeraCrypt
};
} // namespace VeraCrypt
-
diff --git a/src/Main/Forms/PreferencesDialog.cpp b/src/Main/Forms/PreferencesDialog.cpp
index 5492430114..e9cc4c0dd9 100644
--- a/src/Main/Forms/PreferencesDialog.cpp
+++ b/src/Main/Forms/PreferencesDialog.cpp
@@ -55,6 +55,48 @@ namespace VeraCrypt
MountRemovableCheckBox->SetValidator (wxGenericValidator (&Preferences.DefaultMountOptions.Removable));
FilesystemOptionsTextCtrl->SetValue (Preferences.DefaultMountOptions.FilesystemOptions);
+#ifdef TC_LINUX
+ wxBoxSizer *ntfs3PreferenceSizer = new wxBoxSizer (wxHORIZONTAL);
+ MountNtfsWithNtfs3CheckBox = new wxCheckBox (FilesystemSizer->GetStaticBox(), wxID_ANY, LangString["LINUX_PREF_MOUNT_NTFS_WITH_NTFS3"]);
+ MountNtfsWithNtfs3CheckBox->SetToolTip (LangString["LINUX_PREF_MOUNT_NTFS_WITH_NTFS3_HELP"]);
+ ntfs3PreferenceSizer->Add (MountNtfsWithNtfs3CheckBox, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5);
+
+ wxWindow *ntfs3HelpIcon = new wxWindow (FilesystemSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize (16, 16));
+ ntfs3HelpIcon->SetMinSize (wxSize (16, 16));
+ ntfs3HelpIcon->SetToolTip (LangString["LINUX_PREF_MOUNT_NTFS_WITH_NTFS3_HELP"]);
+ ntfs3HelpIcon->Bind (wxEVT_PAINT, [ntfs3HelpIcon] (wxPaintEvent&)
+ {
+ wxPaintDC dc (ntfs3HelpIcon);
+ wxSize size = ntfs3HelpIcon->GetClientSize();
+ wxColour backgroundColor = ntfs3HelpIcon->GetBackgroundColour();
+ wxColour color = ntfs3HelpIcon->GetForegroundColour();
+ int diameter = (size.GetWidth() < size.GetHeight() ? size.GetWidth() : size.GetHeight()) - 1;
+ int x = (size.GetWidth() - diameter) / 2;
+ int y = (size.GetHeight() - diameter) / 2;
+ wxCoord textWidth, textHeight;
+
+ if (ntfs3HelpIcon->GetParent())
+ backgroundColor = ntfs3HelpIcon->GetParent()->GetBackgroundColour();
+ if (!backgroundColor.IsOk())
+ backgroundColor = wxSystemSettings::GetColour (wxSYS_COLOUR_WINDOW);
+ if (!color.IsOk())
+ color = wxSystemSettings::GetColour (wxSYS_COLOUR_WINDOWTEXT);
+
+ dc.SetBackground (wxBrush (backgroundColor));
+ dc.Clear();
+ dc.SetPen (wxPen (color, 1));
+ dc.SetBrush (*wxTRANSPARENT_BRUSH);
+ dc.SetTextForeground (color);
+ dc.DrawEllipse (x, y, diameter, diameter);
+ dc.GetTextExtent (L"?", &textWidth, &textHeight);
+ dc.DrawText (L"?", (size.GetWidth() - textWidth) / 2, (size.GetHeight() - textHeight) / 2 - 1);
+ });
+ ntfs3PreferenceSizer->Add (ntfs3HelpIcon, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, 10);
+
+ FilesystemSizer->Add (ntfs3PreferenceSizer, 0, wxALL, 5);
+
+ MountNtfsWithNtfs3CheckBox->SetValidator (wxGenericValidator (&Preferences.DefaultMountOptions.MountNtfsWithNtfs3));
+#endif
int index, prfInitialIndex = 0;
Pkcs5PrfChoice->Append (LangString["AUTODETECTION"]);
diff --git a/src/Main/Forms/PreferencesDialog.h b/src/Main/Forms/PreferencesDialog.h
index 112eccf75d..b8b059db06 100644
--- a/src/Main/Forms/PreferencesDialog.h
+++ b/src/Main/Forms/PreferencesDialog.h
@@ -55,6 +55,9 @@ namespace VeraCrypt
};
KeyfilesPanel *DefaultKeyfilesPanel;
+#ifdef TC_LINUX
+ wxCheckBox *MountNtfsWithNtfs3CheckBox;
+#endif
int LastVirtualKeyPressed;
unique_ptr mTimer;
UserPreferences Preferences;
diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp
index 86056b627d..5f452b38be 100644
--- a/src/Main/UserInterface.cpp
+++ b/src/Main/UserInterface.cpp
@@ -1259,6 +1259,19 @@ const FileManager fileManagers[] = {
" with option -t. Default type is 'auto'. When creating a new volume, this\n"
" option specifies the filesystem to be created on the new volume.\n"
" Filesystem type 'none' disables mounting or creating a filesystem.\n"
+#ifdef TC_LINUX
+ " On Linux, filesystem type 'ntfs3' mounts an NTFS volume using the\n"
+ " in-kernel ntfs3 driver. The ntfs3 kernel module must be available\n"
+ " and allowed by the distribution; otherwise mounting may fail.\n"
+ " The Linux preference \"Mount NTFS volumes with the Linux kernel ntfs3\n"
+ " driver\" is disabled by default. When enabled, VeraCrypt probes the\n"
+ " decrypted virtual device with blkid -p and applies ntfs3 only when\n"
+ " NTFS is detected and no explicit filesystem type was supplied. If\n"
+ " detection fails, VeraCrypt uses the normal automatic filesystem\n"
+ " selection. This can avoid suspend or hibernate hangs caused by frozen\n"
+ " user-space FUSE filesystems during kernel filesystem sync; use findmnt\n"
+ " to verify the actual mounted filesystem type.\n"
+#endif
"\n"
"--force\n"
" Force mounting of a volume in use, unmounting of a volume in use, or\n"
@@ -1398,6 +1411,11 @@ const FileManager fileManagers[] = {
"Mount a volume prompting only for its password:\n"
"veracrypt -t -k \"\" --pim=0 --protect-hidden=no volume.hc /media/veracrypt1\n"
"\n"
+#ifdef TC_LINUX
+ "Mount an NTFS volume using the Linux in-kernel ntfs3 driver:\n"
+ "veracrypt -t --filesystem=ntfs3 volume.hc /media/veracrypt1\n"
+ "\n"
+#endif
"Unmount a volume:\n"
"veracrypt -u volume.hc\n"
"\n"
diff --git a/src/Main/UserPreferences.cpp b/src/Main/UserPreferences.cpp
index 6f4f208d14..61734667e0 100644
--- a/src/Main/UserPreferences.cpp
+++ b/src/Main/UserPreferences.cpp
@@ -102,6 +102,9 @@ namespace VeraCrypt
if (configMap.count(L"MountVolumesReadOnly") > 0) { SetValue (configMap[L"MountVolumesReadOnly"], readOnly); configMap.erase (L"MountVolumesReadOnly"); }
DefaultMountOptions.Protection = readOnly ? VolumeProtection::ReadOnly : VolumeProtection::None;
+#ifdef TC_LINUX
+ if (configMap.count(L"MountNtfsWithNtfs3") > 0) { SetValue (configMap[L"MountNtfsWithNtfs3"], DefaultMountOptions.MountNtfsWithNtfs3); configMap.erase (L"MountNtfsWithNtfs3"); }
+#endif
if (configMap.count(L"MountVolumesRemovable") > 0) { SetValue (configMap[L"MountVolumesRemovable"], DefaultMountOptions.Removable); configMap.erase (L"MountVolumesRemovable"); }
if (configMap.count(L"NoHardwareCrypto") > 0) { SetValue (configMap[L"NoHardwareCrypto"], DefaultMountOptions.NoHardwareCrypto); configMap.erase (L"NoHardwareCrypto"); }
if (configMap.count(L"NoKernelCrypto") > 0) { SetValue (configMap[L"NoKernelCrypto"], DefaultMountOptions.NoKernelCrypto); configMap.erase (L"NoKernelCrypto"); }
@@ -221,6 +224,9 @@ namespace VeraCrypt
TC_CONFIG_ADD (MountDevicesOnLogon);
TC_CONFIG_ADD (MountFavoritesOnLogon);
formatter.AddEntry (L"MountVolumesReadOnly", DefaultMountOptions.Protection == VolumeProtection::ReadOnly);
+#ifdef TC_LINUX
+ formatter.AddEntry (L"MountNtfsWithNtfs3", DefaultMountOptions.MountNtfsWithNtfs3);
+#endif
formatter.AddEntry (L"MountVolumesRemovable", DefaultMountOptions.Removable);
formatter.AddEntry (L"NoHardwareCrypto", DefaultMountOptions.NoHardwareCrypto);
formatter.AddEntry (L"NoKernelCrypto", DefaultMountOptions.NoKernelCrypto);