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

[dracutlukscfg] More static methods -> free functions

Browse Source
This commit is contained in:
Adriaan de Groot 2020-11-30 14:32:36 +01:00
parent 6d02bab098
commit d2c7c42aec
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/dracutlukscfg/DracutLuksCfgJob.cpp
View File

@ -57,9 +57,8 @@ partitions()
return globalStorage->value( QStringLiteral( "partitions" ) ).toList(); return globalStorage->value( QStringLiteral( "partitions" ) ).toList();
} }
// static static bool
bool isRootEncrypted()
DracutLuksCfgJob::isRootEncrypted()
{ {
const QVariantList partitions = ::partitions(); const QVariantList partitions = ::partitions();
for ( const QVariant& partition : partitions ) for ( const QVariant& partition : partitions )
@ -74,9 +73,8 @@ DracutLuksCfgJob::isRootEncrypted()
return false; return false;
} }
// static static bool
bool hasUnencryptedSeparateBoot()
DracutLuksCfgJob::hasUnencryptedSeparateBoot()
{ {
const QVariantList partitions = ::partitions(); const QVariantList partitions = ::partitions();
for ( const QVariant& partition : partitions ) for ( const QVariant& partition : partitions )
@ -91,9 +89,8 @@ DracutLuksCfgJob::hasUnencryptedSeparateBoot()
return false; return false;
} }
// static static QString
QString swapOuterUuid()
DracutLuksCfgJob::swapOuterUuid()
{ {
const QVariantList partitions = ::partitions(); const QVariantList partitions = ::partitions();
for ( const QVariant& partition : partitions ) for ( const QVariant& partition : partitions )
@ -148,7 +145,7 @@ DracutLuksCfgJob::exec()
QTextStream outStream( &configFile ); QTextStream outStream( &configFile );
outStream << CONFIG_FILE_HEADER outStream << CONFIG_FILE_HEADER
<< ( hasUnencryptedSeparateBoot() ? CONFIG_FILE_CRYPTTAB_LINE : CONFIG_FILE_CRYPTTAB_KEYFILE_LINE ); << ( hasUnencryptedSeparateBoot() ? CONFIG_FILE_CRYPTTAB_LINE : CONFIG_FILE_CRYPTTAB_KEYFILE_LINE );
const QString swapOuterUuid = DracutLuksCfgJob::swapOuterUuid(); const QString swapOuterUuid = ::swapOuterUuid();
if ( !swapOuterUuid.isEmpty() ) if ( !swapOuterUuid.isEmpty() )
{ {
cDebug() << "[DRACUTLUKSCFG]: Swap outer UUID" << swapOuterUuid; cDebug() << "[DRACUTLUKSCFG]: Swap outer UUID" << swapOuterUuid;

4
src/modules/dracutlukscfg/DracutLuksCfgJob.h
View File

@ -38,10 +38,6 @@ private:
static const char* CONFIG_FILE_CRYPTTAB_KEYFILE_LINE; static const char* CONFIG_FILE_CRYPTTAB_KEYFILE_LINE;
static const char* CONFIG_FILE_CRYPTTAB_LINE; static const char* CONFIG_FILE_CRYPTTAB_LINE;
static const QLatin1String CONFIG_FILE_SWAPLINE; static const QLatin1String CONFIG_FILE_SWAPLINE;
static bool isRootEncrypted();
static bool hasUnencryptedSeparateBoot();
static QString swapOuterUuid();
}; };
CALAMARES_PLUGIN_FACTORY_DECLARATION( DracutLuksCfgJobFactory ) CALAMARES_PLUGIN_FACTORY_DECLARATION( DracutLuksCfgJobFactory )