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

Move ReplacePartition operation to PartitionActions.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-11-18 16:02:51 +01:00
parent f267410dbb
commit 8a6dcfbe2f
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/modules/partition/core/PartitionActions.cpp
View File

@ -28,6 +28,7 @@
#include "GlobalStorage.h"
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <QDir>
@ -195,4 +196,25 @@ doAutopartition( PartitionCoreModule* core, Device* dev )
core->dumpQueue();
}
void
doReplacePartition( PartitionCoreModule* core, Device* dev, Partition* partition )
{
Partition* newPartition = KPMHelpers::createNewPartition(
partition->parent(),
*dev,
partition->roles(),
FileSystem::Ext4,
partition->firstSector(),
partition->lastSector() );
PartitionInfo::setMountPoint( newPartition, "/" );
PartitionInfo::setFormat( newPartition, true );
core->deletePartition( dev, partition );
core->createPartition( dev, newPartition );
core->dumpQueue();
}
}

2
src/modules/partition/core/PartitionActions.h
View File

@ -21,10 +21,12 @@
class PartitionCoreModule;
class Device;
class Partition;
namespace PartitionActions
{
void doAutopartition( PartitionCoreModule* core, Device* dev );
void doReplacePartition( PartitionCoreModule* core, Device* dev, Partition* partition );
}
#endif // PARTITIONACTIONS_H

13
src/modules/partition/gui/ReplacePage.cpp
View File

@ -24,6 +24,7 @@
#include "core/KPMHelpers.h"
#include "core/PartitionInfo.h"
#include "core/DeviceModel.h"
#include "core/PartitionActions.h"
#include "JobQueue.h"
#include "GlobalStorage.h"
@ -109,18 +110,8 @@ ReplacePage::applyChanges()
if ( partition )
{
Device* dev = model->device();
Partition* newPartition = KPMHelpers::createNewPartition(
partition->parent(),
*dev,
partition->roles(),
FileSystem::Ext4,
partition->firstSector(),
partition->lastSector() );
PartitionInfo::setMountPoint( newPartition, "/" );
PartitionInfo::setFormat( newPartition, true );
m_core->deletePartition( dev, partition );
m_core->createPartition( dev, newPartition );
PartitionActions::doReplacePartition( m_core, dev, partition );
if ( m_isEfi )
{