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

[partition] Simplify ClearTempMounts

Browse Source 
- use the shared function for reading mtab entries
This commit is contained in:
Adriaan de Groot 2021-12-08 17:27:58 +01:00
parent 0070dd2c01
commit 5e4866c439
1 changed files with 10 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/modules/partition/jobs/ClearTempMountsJob.cpp
View File

@ -9,6 +9,7 @@
#include "ClearTempMountsJob.h" #include "ClearTempMountsJob.h"
#include "partition/Mount.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/String.h" #include "utils/String.h"
@ -45,51 +46,23 @@ ClearTempMountsJob::exec()
{ {
Logger::Once o; Logger::Once o;
// Fetch a list of current mounts to Calamares temporary directories. // Fetch a list of current mounts to Calamares temporary directories.
QList< QPair< QString, QString > > lst; using MtabInfo = CalamaresUtils::Partition::MtabInfo;
QFile mtab( "/etc/mtab" ); auto targetMounts = MtabInfo::fromMtabFilteredByPrefix( QStringLiteral( "/tmp/calamares-" ) );
if ( !mtab.open( QFile::ReadOnly | QFile::Text ) )
{
return Calamares::JobResult::error( tr( "Cannot get list of temporary mounts." ) );
}
cVerbose() << o << "Opened mtab. Lines:"; if ( targetMounts.isEmpty() )
QTextStream in( &mtab );
QString lineIn = in.readLine();
while ( !lineIn.isNull() )
{
QStringList line = lineIn.split( ' ', SplitSkipEmptyParts );
cVerbose() << o << line.join( ' ' );
QString device = line.at( 0 );
QString mountPoint = line.at( 1 );
if ( mountPoint.startsWith( "/tmp/calamares-" ) )
{
lst.append( qMakePair( device, mountPoint ) );
}
lineIn = in.readLine();
}
if ( lst.empty() )
{ {
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
} }
std::sort( targetMounts.begin(), targetMounts.end(), MtabInfo::mountPointOrder );
std::sort(
lst.begin(), lst.end(), []( const QPair< QString, QString >& a, const QPair< QString, QString >& b ) -> bool {
return a.first > b.first;
} );
QStringList goodNews; QStringList goodNews;
QProcess process; for ( const auto& m : qAsConst( targetMounts ) )
for ( const auto& line : qAsConst( lst ) )
{ {
QString partPath = line.second; cDebug() << o << "Will try to umount path" << m.mountPoint;
cDebug() << o << "Will try to umount path" << partPath; if ( CalamaresUtils::Partition::unmount( m.mountPoint, { "-lv" } ) == 0 )
process.start( "umount", { "-lv", partPath } );
process.waitForFinished();
if ( process.exitCode() == 0 )
{ {
goodNews.append( QString( "Successfully unmounted %1." ).arg( partPath ) ); // Returns the program's exit code, so 0 is success
goodNews.append( QString( "Successfully unmounted %1." ).arg( m.mountPoint ) );
} }
} }