mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2026-05-22 04:21:29 +00:00
Linux: Add support for Btrfs filesystem when creating volumes
This commit is contained in:
@@ -466,25 +466,7 @@ namespace VeraCrypt
|
||||
|
||||
#ifdef TC_UNIX
|
||||
// Format non-FAT filesystem
|
||||
const char *fsFormatter = nullptr;
|
||||
|
||||
switch (SelectedFilesystemType)
|
||||
{
|
||||
#if defined (TC_LINUX)
|
||||
case VolumeCreationOptions::FilesystemType::Ext2: fsFormatter = "mkfs.ext2"; break;
|
||||
case VolumeCreationOptions::FilesystemType::Ext3: fsFormatter = "mkfs.ext3"; break;
|
||||
case VolumeCreationOptions::FilesystemType::Ext4: fsFormatter = "mkfs.ext4"; break;
|
||||
case VolumeCreationOptions::FilesystemType::NTFS: fsFormatter = "mkfs.ntfs"; break;
|
||||
case VolumeCreationOptions::FilesystemType::exFAT: fsFormatter = "mkfs.exfat"; break;
|
||||
#elif defined (TC_MACOSX)
|
||||
case VolumeCreationOptions::FilesystemType::MacOsExt: fsFormatter = "newfs_hfs"; break;
|
||||
case VolumeCreationOptions::FilesystemType::exFAT: fsFormatter = "newfs_exfat"; break;
|
||||
case VolumeCreationOptions::FilesystemType::APFS: fsFormatter = "newfs_apfs"; break;
|
||||
#elif defined (TC_FREEBSD) || defined (TC_SOLARIS)
|
||||
case VolumeCreationOptions::FilesystemType::UFS: fsFormatter = "newfs" ; break;
|
||||
#endif
|
||||
default: break;
|
||||
}
|
||||
const char *fsFormatter = VolumeCreationOptions::FilesystemType::GetFsFormatter (SelectedFilesystemType);
|
||||
|
||||
if (fsFormatter)
|
||||
{
|
||||
@@ -544,6 +526,9 @@ namespace VeraCrypt
|
||||
if (SelectedFilesystemType == VolumeCreationOptions::FilesystemType::NTFS)
|
||||
args.push_back ("-f");
|
||||
|
||||
if (SelectedFilesystemType == VolumeCreationOptions::FilesystemType::Btrfs)
|
||||
args.push_back ("-f");
|
||||
|
||||
args.push_back (string (virtualDevice));
|
||||
|
||||
Process::Execute (fsFormatter, args);
|
||||
|
||||
Reference in New Issue
Block a user