napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[partition] Preserve the will-it-be-formatted flag of the partition

Browse Source
This commit is contained in:
Adriaan de Groot 2024-02-17 15:40:42 +01:00
parent ecd8839ac9
commit f23b4ff267
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/partition/gui/EditExistingPartitionDialog.cpp
View File

@ -128,14 +128,7 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,
// Force a format if the existing device is a zfs device since reusing a zpool isn't currently supported // Force a format if the existing device is a zfs device since reusing a zpool isn't currently supported
const bool partitionIsZFS = m_partition->fileSystem().type() == FileSystem::Type::Zfs; const bool partitionIsZFS = m_partition->fileSystem().type() == FileSystem::Type::Zfs;
if ( partitionIsZFS ) m_ui->formatRadioButton->setChecked( partitionIsZFS || PartitionInfo::format( m_partition ) );
{
m_ui->formatRadioButton->setChecked( true );
}
else
{
m_ui->formatRadioButton->setChecked( false );
}
m_ui->formatRadioButton->setEnabled( !partitionIsZFS ); m_ui->formatRadioButton->setEnabled( !partitionIsZFS );
m_ui->keepRadioButton->setChecked( !partitionIsZFS ); m_ui->keepRadioButton->setChecked( !partitionIsZFS );
m_ui->keepRadioButton->setEnabled( !partitionIsZFS ); m_ui->keepRadioButton->setEnabled( !partitionIsZFS );
@ -205,6 +198,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
{ {
core->setPartitionFlags( m_device, m_partition, resultFlags ); core->setPartitionFlags( m_device, m_partition, resultFlags );
} }
PartitionInfo::setFormat( m_partition, false );
} }
} }
else else
@ -221,6 +215,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
core->setPartitionFlags( m_device, m_partition, resultFlags ); core->setPartitionFlags( m_device, m_partition, resultFlags );
} }
core->setFilesystemLabel( m_device, m_partition, fsLabel ); core->setFilesystemLabel( m_device, m_partition, fsLabel );
PartitionInfo::setFormat( m_partition, true );
} }
else // otherwise, we delete and recreate the partition with new fs type else // otherwise, we delete and recreate the partition with new fs type
{ {
@ -254,6 +249,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
{ {
core->setFilesystemLabel( m_device, m_partition, fsLabel ); core->setFilesystemLabel( m_device, m_partition, fsLabel );
} }
PartitionInfo::setFormat( m_partition, false );
core->refreshPartition( m_device, m_partition ); core->refreshPartition( m_device, m_partition );
} }