applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-28 09:55:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[partition] Including revert on creation of LVM VGs.

Browse source
This commit is contained in:
Caio 2018-06-08 20:20:05 -03:00
parent f8897e0e0b
commit 0465cc4214
4 changed files with 50 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/modules/partition/core/PartitionCoreModule.cpp
View file

@ -680,8 +680,33 @@ PartitionCoreModule::revert()
void
PartitionCoreModule::revertAllDevices()
{
foreach ( DeviceInfo* devInfo, m_deviceInfos )
revertDevice( devInfo->device.data() );
for ( auto it = m_deviceInfos.begin(); it != m_deviceInfos.end(); )
{
// In new VGs device info, there will be always a CreateVolumeGroupJob as the first job in jobs list
if ( !( *it )->jobs.empty() )
{
CreateVolumeGroupJob* vgJob = dynamic_cast<CreateVolumeGroupJob*>( ( *it )->jobs[0].data() );
if ( vgJob )
{
vgJob->undoPreview();
( *it )->forgetChanges();
m_deviceModel->removeDevice( ( *it )->device.data() );
it = m_deviceInfos.erase( it );
scanForLVMPVs();
}
}
else
{
revertDevice( ( *it )->device.data() );
++it;
}
}
refresh();
}
@ -691,6 +716,7 @@ PartitionCoreModule::revertDevice( Device* dev )
{
QMutexLocker locker( &m_revertMutex );
DeviceInfo* devInfo = infoForDevice( dev );
if ( !devInfo )
return;
devInfo->forgetChanges();