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

Clear swap partitions after swapoffing them.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-06-20 19:28:36 +02:00
parent f54ab5b3f5
commit 91cf3950df
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,7 +156,13 @@ ClearMountsJob::tryUmount( const QString& partPath )
process.start( "swapoff", { partPath } ); process.start( "swapoff", { partPath } );
process.waitForFinished(); process.waitForFinished();
if ( process.exitCode() == 0 ) if ( process.exitCode() == 0 )
return QString( "Successfully disabled swap %1." ).arg( partPath ); {
process.start( "mkswap", { partPath } );
process.waitForFinished();
if ( process.exitCode() == 0 )
return QString( "Successfully disabled and cleared swap %1." ).arg( partPath );
return QString( "Successfully disabled but not cleared swap %1." ).arg( partPath );
}
return QString(); return QString();
} }