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

Hook up ClearMountsJob in PartitionCoreModule.

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-11-28 15:51:59 +01:00
parent 1de7b55c3b
commit e85b2d164f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/partition/core/PartitionCoreModule.cpp
View File

@ -25,6 +25,7 @@
#include <core/PartitionIterator.h> #include <core/PartitionIterator.h>
#include <core/PartitionModel.h> #include <core/PartitionModel.h>
#include <core/PMUtils.h> #include <core/PMUtils.h>
#include <jobs/ClearMountsJob.h>
#include <jobs/CreatePartitionJob.h> #include <jobs/CreatePartitionJob.h>
#include <jobs/CreatePartitionTableJob.h> #include <jobs/CreatePartitionTableJob.h>
#include <jobs/DeletePartitionJob.h> #include <jobs/DeletePartitionJob.h>
@ -279,12 +280,19 @@ PartitionCoreModule::jobs() const
{ {
QList< Calamares::job_ptr > lst; QList< Calamares::job_ptr > lst;
QList< Device* > devices; QList< Device* > devices;
for ( auto info : m_deviceInfos )
{
lst << Calamares::job_ptr( new ClearMountsJob( info->device.data() ) );
}
for ( auto info : m_deviceInfos ) for ( auto info : m_deviceInfos )
{ {
lst << info->jobs; lst << info->jobs;
devices << info->device.data(); devices << info->device.data();
} }
lst << Calamares::job_ptr( new FillGlobalStorageJob( devices, m_bootLoaderInstallPath ) ); lst << Calamares::job_ptr( new FillGlobalStorageJob( devices, m_bootLoaderInstallPath ) );
return lst; return lst;
} }