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

[luksbootkeyfile] Extract partitioning keyphrases from GS

Browse Source
This commit is contained in:
Adriaan de Groot 2019-07-04 13:17:34 +02:00
parent 676df86712
commit 745b4b1693
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
View File

@ -49,7 +49,37 @@ struct GlobalSettings
GlobalSettings( const QVariant& partitions )
: valid( false )
{
cDebug() << partitions;
if ( partitions.canConvert<QVariantList>() )
{
filesystems = getPartitionInfo( partitions.toList() );
valid = true;
}
}
/** @brief Extract the luks passphrases setup.
*
* Given a list of partitions (as set up by the partitioning module,
* so there's maps with keys inside), returns just the list of
* luks passphrases for each device.
*/
static QList< LuksPassphrase > getPartitionInfo( const QVariantList& list )
{
int count = 0;
for( const auto& p : list )
{
if ( p.canConvert< QVariantMap>() )
{
auto pinfo = p.toMap();
QString device = pinfo["device"].toString();
QString fs = pinfo["fs"].toString();
QString mountPoint = pinfo["mountPoint"].toString();
QString uuid = pinfo["uuid"].toString();
cDebug() << count << "D=" << device << mountPoint << '(' << fs << ')';
}
count++;
}
return QList< LuksPassphrase >();
}
QList< LuksPassphrase > filesystems;
@ -69,7 +99,7 @@ LuksBootKeyFileJob::exec()
{
return Calamares::JobResult::internalError(
"LukeBootKeyFile",
tr( "No partitions are defined for <pre>%1</pre> to use." ).arg( "luksbootkeyfile" ),
tr( "No partitions are defined for LUKS to use." ).arg( "luksbootkeyfile" ),
Calamares::JobResult::InvalidConfiguration );
}