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

[fsresizer] Match configuration to system

Browse Source 
- Bail out earlier before doing any work if the configuration
   is invalid.
 - If it's valid, look for a matching device.
This commit is contained in:
Adriaan de Groot 2018-09-27 03:56:57 -04:00
parent aae4b38e69
commit 1c2714d832
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/modules/fsresizer/ResizeFSJob.cpp
View File

@ -92,6 +92,13 @@ ResizeFSJob::prettyName() const
Calamares::JobResult Calamares::JobResult
ResizeFSJob::exec() ResizeFSJob::exec()
{ {
if ( !isValid() )
return Calamares::JobResult::error(
tr( "Invalid configuration" ),
tr( "The file-system resize job has an invalid configuration "
"and will not run." ) );
// Get KPMCore
auto backend_p = CoreBackendManager::self()->backend(); auto backend_p = CoreBackendManager::self()->backend();
if ( backend_p ) if ( backend_p )
cDebug() << "KPMCore backend @" << (void *)backend_p << backend_p->id() << backend_p->version(); cDebug() << "KPMCore backend @" << (void *)backend_p << backend_p->id() << backend_p->version();
@ -117,6 +124,9 @@ ResizeFSJob::exec()
tr( "Calamares cannot start KPMCore for the file-system resize job." ) ); tr( "Calamares cannot start KPMCore for the file-system resize job." ) );
} }
Device* resize_this_device = nullptr;
Partition* resize_this_partition = nullptr;
using DeviceList = QList< Device* >; using DeviceList = QList< Device* >;
DeviceList devices = backend_p->scanDevices( false ); DeviceList devices = backend_p->scanDevices( false );
cDebug() << "ResizeFSJob found" << devices.count() << "devices."; cDebug() << "ResizeFSJob found" << devices.count() << "devices.";
@ -127,15 +137,17 @@ ResizeFSJob::exec()
cDebug() << "ResizeFSJob found" << ( *dev_it )->deviceNode(); cDebug() << "ResizeFSJob found" << ( *dev_it )->deviceNode();
for ( auto part_it = PartitionIterator::begin( *dev_it); part_it != PartitionIterator::end( *dev_it ); ++part_it ) for ( auto part_it = PartitionIterator::begin( *dev_it); part_it != PartitionIterator::end( *dev_it ); ++part_it )
{ {
cDebug() << ".." << ( *part_it )->mountPoint(); cDebug() << ".." << ( *part_it )->mountPoint() << "on" << ( *part_it )->deviceNode();
if ( ( !m_fsname.isEmpty() && ( *part_it )->mountPoint() == m_fsname ) ||
( !m_devicename.isEmpty() && ( *part_it )->deviceNode() == m_devicename ) )
{
resize_this_device = ( *dev_it );
resize_this_partition = ( *part_it );
cDebug() << ".. matched configuration dev=" << m_devicename << "fs=" << m_fsname;
break;
}
} }
} }
if ( !isValid() )
return Calamares::JobResult::error(
tr( "Invalid configuration" ),
tr( "The file-system resize job has an invalid configuration "
"and will not run." ) );
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
} }