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

[fsresizer] Do the resize itself

Browse Source 
- handle weird partition tables
 - ignore unallocated space -- that's what we want to expand into
 - use ResizeOperation for the actual work
This commit is contained in:
Adriaan de Groot 2018-09-28 11:55:16 +02:00
parent 14b6755714
commit 5dc11b223a
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@
#include <kpmcore/core/device.h> #include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h> #include <kpmcore/core/partition.h>
#include <kpmcore/ops/resizeoperation.h> #include <kpmcore/ops/resizeoperation.h>
#include <kpmcore/util/report.h>
#include "CalamaresVersion.h" #include "CalamaresVersion.h"
#include "JobQueue.h" #include "JobQueue.h"
@ -145,15 +146,26 @@ ResizeFSJob::findGrownEnd(ResizeFSJob::PartitionMatch m)
if ( !ResizeOperation::canGrow( m.second ) ) if ( !ResizeOperation::canGrow( m.second ) )
return -1; return -1;
qint64 last_available = m.first->totalLogical(); cDebug() << "Containing device size" << m.first->totalLogical();
cDebug() << "Containing device size" << last_available; qint64 last_available = m.first->totalLogical() - 1; // Numbered from 0
qint64 last_currently = m.second->lastSector(); qint64 last_currently = m.second->lastSector();
cDebug() << "Growing partition" << m.second->firstSector() << '-' << last_currently; cDebug() << "Growing partition" << m.second->firstSector() << '-' << last_currently;
for ( auto part_it = PartitionIterator::begin( m.first ); part_it != PartitionIterator::end( m.first ); ++part_it ) for ( auto part_it = PartitionIterator::begin( m.first ); part_it != PartitionIterator::end( m.first ); ++part_it )
{ {
qint64 next_start = ( *part_it )->firstSector(); qint64 next_start = ( *part_it )->firstSector();
cDebug() << ".. comparing" << next_start << '-' << ( *part_it )->lastSector(); qint64 next_end = ( *part_it )->lastSector();
if ( next_start > next_end )
{
cWarning() << "Corrupt partition has end" << next_end << " < start" << next_start;
std::swap( next_start, next_end );
}
if ( ( *part_it )->roles().has( PartitionRole::Unallocated ) )
{
cDebug() << ".. ignoring unallocated" << next_start << '-' << next_end;
continue;
}
cDebug() << ".. comparing" << next_start << '-' << next_end;
if ( (next_start > last_currently) && (next_start < last_available) ) if ( (next_start > last_currently) && (next_start < last_available) )
{ {
cDebug() << " .. shrunk last available to" << next_start; cDebug() << " .. shrunk last available to" << next_start;
@ -236,9 +248,26 @@ ResizeFSJob::exec()
: tr( "The device %1 can not be resized." ).arg(m_devicename) ); : tr( "The device %1 can not be resized." ).arg(m_devicename) );
} }
cDebug() << "Resize from" << m.second->firstSector() qint64 new_end = findGrownEnd( m );
<< '+' << m.second->length() << '=' << m.second->lastSector() cDebug() << "Resize from"
<< "to" << findGrownEnd( m ); << m.second->firstSector() << '-' << m.second->lastSector()
<< '(' << m.second->length() << ')'
<< "to -" << new_end;
if ( ( new_end > 0 ) && ( new_end > m.second->lastSector() ) )
{
ResizeOperation op( *m.first, *m.second, m.second->firstSector(), new_end );
Report op_report( nullptr );
if ( op.execute( op_report ) )
cDebug() << "Resize operation OK.";
else
{
cDebug() << "Resize failed." << op_report.output();
return Calamares::JobResult::error(
tr( "Resize Failed" ),
report.toText() );
}
}
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
} }