pkgs/tools/misc/calamares/partitions.patch

   1 diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp
   2 index c5b17c69e..353b6f964 100644
   3 --- a/src/modules/partition/gui/CreatePartitionDialog.cpp
   4 +++ b/src/modules/partition/gui/CreatePartitionDialog.cpp
   5 @@ -107,7 +107,8 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device,
   6      {
   7          // We need to ensure zfs is added to the list if the zfs module is enabled
   8          if ( ( fs->type() == FileSystem::Type::Zfs && Calamares::Settings::instance()->isModuleEnabled( "zfs" ) )
   9 -             || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) )
  10 +             || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended
  11 +             && fs->type() != FileSystem::Luks && fs->type() != FileSystem::Luks2 && fs->type() != FileSystem::Minix ) )
  12          {
  13              fsNames << userVisibleFS( fs );  // This is put into the combobox
  14              if ( fs->type() == defaultFSType )
  15 diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
  16 index 0bc35cabe..3cf8a7fa2 100644
  17 --- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
  18 +++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
  19 @@ -95,7 +95,8 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,
  20      {
  21          // We need to ensure zfs is added to the list if the zfs module is enabled
  22          if ( ( fs->type() == FileSystem::Type::Zfs && Calamares::Settings::instance()->isModuleEnabled( "zfs" ) )
  23 -             || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) )
  24 +             || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended
  25 +             && fs->type() != FileSystem::Luks && fs->type() != FileSystem::Luks2 && fs->type() != FileSystem::Minix) )
  26          {
  27              fsNames << userVisibleFS( fs );  // For the combo box
  28          }