forked from mirrors/nixpkgs
29 lines
2 KiB
Diff
29 lines
2 KiB
Diff
diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp
|
|
index c5b17c69e..353b6f964 100644
|
|
--- a/src/modules/partition/gui/CreatePartitionDialog.cpp
|
|
+++ b/src/modules/partition/gui/CreatePartitionDialog.cpp
|
|
@@ -107,7 +107,8 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device,
|
|
{
|
|
// We need to ensure zfs is added to the list if the zfs module is enabled
|
|
if ( ( fs->type() == FileSystem::Type::Zfs && Calamares::Settings::instance()->isModuleEnabled( "zfs" ) )
|
|
- || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) )
|
|
+ || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended
|
|
+ && fs->type() != FileSystem::Luks && fs->type() != FileSystem::Luks2 && fs->type() != FileSystem::Minix ) )
|
|
{
|
|
fsNames << userVisibleFS( fs ); // This is put into the combobox
|
|
if ( fs->type() == defaultFSType )
|
|
diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
|
|
index 0bc35cabe..3cf8a7fa2 100644
|
|
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
|
|
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
|
|
@@ -95,7 +95,8 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,
|
|
{
|
|
// We need to ensure zfs is added to the list if the zfs module is enabled
|
|
if ( ( fs->type() == FileSystem::Type::Zfs && Calamares::Settings::instance()->isModuleEnabled( "zfs" ) )
|
|
- || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) )
|
|
+ || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended
|
|
+ && fs->type() != FileSystem::Luks && fs->type() != FileSystem::Luks2 && fs->type() != FileSystem::Minix) )
|
|
{
|
|
fsNames << userVisibleFS( fs ); // For the combo box
|
|
}
|