implement free-space partition replace install
This commit is contained in:
parent
bb081c915c
commit
fd8c131b26
@ -37,9 +37,6 @@ namespace PartUtils
|
|||||||
bool
|
bool
|
||||||
canBeReplaced( Partition* candidate )
|
canBeReplaced( Partition* candidate )
|
||||||
{
|
{
|
||||||
if ( KPMHelpers::isPartitionFreeSpace( candidate ) )
|
|
||||||
return false;
|
|
||||||
|
|
||||||
bool ok = false;
|
bool ok = false;
|
||||||
double requiredStorageGB = Calamares::JobQueue::instance()
|
double requiredStorageGB = Calamares::JobQueue::instance()
|
||||||
->globalStorage()
|
->globalStorage()
|
||||||
|
@ -579,22 +579,49 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current,
|
|||||||
m_core->revertDevice( selectedDevice() );
|
m_core->revertDevice( selectedDevice() );
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: get the selected partition in the immutable model with PartitionPtrRole,
|
// if the partition is unallocated(free space), we don't replace it but create new one
|
||||||
// check KPMHelpers::isPartitionFreeSpace, if true then don't replace but
|
// with the same first and last sector
|
||||||
// just m_core->createPartition for the same first/last sector as the
|
Partition* selectedPartition = (Partition *)( current.data( PartitionModel::PartitionPtrRole ).value< void* >() );
|
||||||
// free space "partition" in the immutable model.
|
if ( KPMHelpers::isPartitionFreeSpace( selectedPartition ) )
|
||||||
// Also set parent correctly (see PartitionActions::doReplacePartition)
|
{
|
||||||
// as well as mount point and format.
|
PartitionRole newRoles = PartitionRole( PartitionRole::Primary );
|
||||||
|
PartitionNode* newParent = selectedDevice()->partitionTable();
|
||||||
|
|
||||||
|
if ( selectedPartition->parent() )
|
||||||
|
{
|
||||||
|
Partition* parent = dynamic_cast< Partition* >( selectedPartition->parent() );
|
||||||
|
if ( parent && parent->roles().has( PartitionRole::Extended ) )
|
||||||
|
{
|
||||||
|
newRoles = PartitionRole( PartitionRole::Logical );
|
||||||
|
newParent = KPMHelpers::findPartitionByPath( { selectedDevice() }, parent->partitionPath() );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Partition* newPartition = KPMHelpers::createNewPartition(
|
||||||
|
newParent,
|
||||||
|
*selectedDevice(),
|
||||||
|
newRoles,
|
||||||
|
FileSystem::Ext4,
|
||||||
|
selectedPartition->firstSector(),
|
||||||
|
selectedPartition->lastSector() );
|
||||||
|
|
||||||
|
PartitionInfo::setMountPoint( newPartition, "/" );
|
||||||
|
PartitionInfo::setFormat( newPartition, true );
|
||||||
|
|
||||||
|
m_core->createPartition( selectedDevice(), newPartition);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
// We can't use the PartitionPtrRole because we need to make changes to the
|
// We can't use the PartitionPtrRole because we need to make changes to the
|
||||||
// main DeviceModel, not the immutable copy.
|
// main DeviceModel, not the immutable copy.
|
||||||
QString partPath = current.data( PartitionModel::PartitionPathRole ).toString();
|
QString partPath = current.data( PartitionModel::PartitionPathRole ).toString();
|
||||||
Partition* partition = KPMHelpers::findPartitionByPath( { selectedDevice() },
|
selectedPartition = KPMHelpers::findPartitionByPath( { selectedDevice() },
|
||||||
partPath );
|
partPath );
|
||||||
if ( partition )
|
if ( selectedPartition )
|
||||||
PartitionActions::doReplacePartition( m_core,
|
PartitionActions::doReplacePartition( m_core,
|
||||||
selectedDevice(),
|
selectedDevice(),
|
||||||
partition );
|
selectedPartition );
|
||||||
|
}
|
||||||
} ),
|
} ),
|
||||||
[=]
|
[=]
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user