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

Get luksUuid instead of innerFs UUID.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-05-05 13:29:08 +02:00
parent e1ee6e181a
commit cd304b7a6f
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/partition/jobs/FillGlobalStorageJob.cpp
View File

@ -37,6 +37,7 @@
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <QProcess>
typedef QHash<QString, QString> UuidForPartitionHash; typedef QHash<QString, QString> UuidForPartitionHash;
@ -62,6 +63,22 @@ findPartitionUuids( QList < Device* > devices )
return hash; return hash;
} }
static QString
getLuksUuid( const QString& path )
{
QProcess process;
process.setProgram( "cryptsetup" );
process.setArguments( { "luksUUID", path } );
process.start();
process.waitForFinished();
if ( process.exitStatus() != QProcess::NormalExit || process.exitCode() )
return QString();
QString uuid = QString::fromLocal8Bit( process.readAllStandardOutput() ).trimmed();
return uuid;
}
static QVariant static QVariant
mapForPartition( Partition* partition, const QString& uuid ) mapForPartition( Partition* partition, const QString& uuid )
{ {
@ -82,6 +99,7 @@ mapForPartition( Partition* partition, const QString& uuid )
if ( luksFs ) if ( luksFs )
{ {
map[ "luksMapperName" ] = luksFs->suggestedMapperName( partition->partitionPath() ); map[ "luksMapperName" ] = luksFs->suggestedMapperName( partition->partitionPath() );
map[ "luksUuid" ] = getLuksUuid( partition->partitionPath() );
cDebug() << "luksMapperName:" << map[ "luksMapperName" ]; cDebug() << "luksMapperName:" << map[ "luksMapperName" ];
} }
} }