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

[partition] Extract the get-PV-groups code to its own function

Browse Source 
- get the list (once)
- move the lambda to a named function for readability
This commit is contained in:
Adriaan de Groot 2021-11-02 11:18:14 +01:00
parent 7fa02fd41c
commit ca4a187d1a
1 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,8 +165,43 @@ getLVMVolumes()
else else
{ {
cWarning() << "this system does not seem to have LVM2 tools."; cWarning() << "this system does not seem to have LVM2 tools.";
return QStringList();
} }
return QStringList();
}
STATICTEST QStringList
getPVGroups( const QString& deviceName )
{
QProcess process;
// Then we go looking for volume groups that use this device for physical volumes
process.start( "pvdisplay", { "-C", "--noheadings" } );
process.waitForFinished();
if ( process.exitCode() == 0 ) //means LVM2 tools are installed
{
QString pvdisplayOutput = process.readAllStandardOutput();
if ( !pvdisplayOutput.simplified().isEmpty() ) //means there is at least one LVM PV
{
QSet< QString > vgSet;
const QStringList pvdisplayLines = pvdisplayOutput.split( '\n' );
for ( const QString& pvdisplayLine : pvdisplayLines )
{
QString pvPath = pvdisplayLine.simplified().split( ' ' ).value( 0 );
QString vgName = pvdisplayLine.simplified().split( ' ' ).value( 1 );
if ( !pvPath.contains( deviceName ) )
{
continue;
}
vgSet.insert( vgName );
}
return QStringList { vgSet.cbegin(), vgSet.cend() };
}
}
else
{
cWarning() << "this system does not seem to have LVM2 tools.";
}
return QStringList();
} }
/* /*
@ -274,10 +309,21 @@ tryCryptoClose( const QString& mapperPath )
return {}; return {};
} }
STATICTEST MessageAndPath
tryVGDisable( const QString& vgName )
{
QProcess vgProcess;
vgProcess.start( "vgchange", { "-an", vgName } );
vgProcess.waitForFinished();
return ( vgProcess.exitCode() == 0 )
? MessageAndPath { QT_TRANSLATE_NOOP( "ClearMountsJob", "Successfully disabled volume group %1." ), vgName }
: MessageAndPath {};
}
///@brief Apply @p f to all the @p paths, appending successes to @p news ///@brief Apply @p f to all the @p paths, appending successes to @p news
template < typename T, typename F > template < typename F >
void void
apply( const T& paths, F f, QList< MessageAndPath >& news ) apply( const QStringList& paths, F f, QList< MessageAndPath >& news )
{ {
for ( const QString& p : qAsConst( paths ) ) for ( const QString& p : qAsConst( paths ) )
{ {
@ -333,49 +379,7 @@ ClearMountsJob::exec()
apply( getCryptoDevices(), tryCryptoClose, goodNews ); apply( getCryptoDevices(), tryCryptoClose, goodNews );
apply( getLVMVolumes(), tryUmount, goodNews ); apply( getLVMVolumes(), tryUmount, goodNews );
apply( getPVGroups( deviceName ), tryVGDisable, goodNews );
// Then we go looking for volume groups that use this device for physical volumes
process.start( "pvdisplay", { "-C", "--noheadings" } );
process.waitForFinished();
if ( process.exitCode() == 0 ) //means LVM2 tools are installed
{
QString pvdisplayOutput = process.readAllStandardOutput();
if ( !pvdisplayOutput.simplified().isEmpty() ) //means there is at least one LVM PV
{
QSet< QString > vgSet;
const QStringList pvdisplayLines = pvdisplayOutput.split( '\n' );
for ( const QString& pvdisplayLine : pvdisplayLines )
{
QString pvPath = pvdisplayLine.simplified().split( ' ' ).value( 0 );
QString vgName = pvdisplayLine.simplified().split( ' ' ).value( 1 );
if ( !pvPath.contains( deviceName ) )
{
continue;
}
vgSet.insert( vgName );
}
apply(
vgSet,
[]( const QString& vgName ) {
QProcess vgProcess;
vgProcess.start( "vgchange", { "-an", vgName } );
vgProcess.waitForFinished();
return ( vgProcess.exitCode() == 0 )
? MessageAndPath { QT_TRANSLATE_NOOP( "ClearMountsJob",
"Successfully disabled volume group %1." ),
vgName }
: MessageAndPath {};
},
goodNews );
}
}
else
{
cWarning() << "this system does not seem to have LVM2 tools.";
}
apply( getCryptoDevices(), tryCryptoClose, goodNews ); apply( getCryptoDevices(), tryCryptoClose, goodNews );
apply( partitionsList, tryUmount, goodNews ); apply( partitionsList, tryUmount, goodNews );