From 126ad300ae74e14bf6ed92fb71211bde034802cc Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Fri, 22 Apr 2016 16:50:46 +0200 Subject: [PATCH] Write mapperName for LUKS volumes in GlobalStorage. --- src/modules/partition/jobs/FillGlobalStorageJob.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp index 41a8580df..1c802eb75 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp +++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp @@ -31,6 +31,7 @@ #include #include #include +#include // Qt #include @@ -73,6 +74,18 @@ mapForPartition( Partition* partition, const QString& uuid ) << "mtpoint:" << PartitionInfo::mountPoint( partition ) << "fs:" << partition->fileSystem().name() << uuid; + + if ( partition->roles().has( PartitionRole::Luks ) ) + { + const FileSystem& fsRef = partition->fileSystem(); + const FS::luks* luksFs = dynamic_cast< const FS::luks* >( &fsRef ); + if ( luksFs ) + { + map[ "luksMapperName" ] = luksFs->suggestedMapperName( partition->partitionPath() ); + cDebug() << "luksMapperName:" << map[ "luksMapperName" ]; + } + } + return map; }