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

[fsresizer] Bail out if resize required but not feasible

Browse Source
This commit is contained in:
Adriaan de Groot 2018-10-01 04:14:15 -04:00
parent 0b4c0f9c38
commit eb7c6385cd
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,9 +297,14 @@ ResizeFSJob::exec()
: tr( "The device %1 can not be resized." ).arg(m_devicename) ); : tr( "The device %1 can not be resized." ).arg(m_devicename) );
if ( new_end == 0 ) if ( new_end == 0 )
{ {
// TODO: is that a bad thing? is the resize required?
cWarning() << "Resize operation on" << m_fsname << m_devicename cWarning() << "Resize operation on" << m_fsname << m_devicename
<< "skipped as not-useful."; << "skipped as not-useful.";
if ( m_required )
return Calamares::JobResult::error(
tr( "Resize Failed" ),
!m_fsname.isEmpty() ? tr( "The filesystem %1 must be resized, but cannot." ).arg(m_fsname)
: tr( "The device %11 must be resized, but cannot" ).arg(m_fsname) );
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
} }