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

Keep UUID when clearing swap.

Browse Source 
CAL-156 #comment I've just pushed a fix attempt for this, please test.
This commit is contained in:
Teo Mrnjavac 2015-09-17 15:14:18 +02:00
parent dad7831951
commit c5f9397d18
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/partition/jobs/ClearMountsJob.cpp
View File

@ -200,10 +200,17 @@ QString
ClearMountsJob::tryClearSwap( const QString& partPath )
{
QProcess process;
process.start( "mkswap", { partPath } );
process.start( "blkid", { "-s", "UUID", "-o", "value", partPath } );
process.waitForFinished();
if ( process.exitCode() == 0 )
return QString( "Successfully cleared swap %1." ).arg( partPath );
QString swapPartUuid = QString::fromLocal8Bit( process.readAllStandardOutput() ).simplified();
if ( process.exitCode() != 0 ||
swapPartUuid.isEmpty() )
return QString();
process.start( "mkswap", { "-U", swapPartUuid, partPath } );
process.waitForFinished();
if ( process.exitCode() != 0 )
return QString();
return QString( "Successfully cleared swap %1." ).arg( partPath );
}