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

Always declare whether a partition is LUKS in the map.

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

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

@ -87,6 +87,7 @@ mapForPartition( Partition* partition, const QString& uuid )
map[ "mountPoint" ] = PartitionInfo::mountPoint( partition ); map[ "mountPoint" ] = PartitionInfo::mountPoint( partition );
map[ "fs" ] = partition->fileSystem().name(); map[ "fs" ] = partition->fileSystem().name();
map[ "uuid" ] = uuid; map[ "uuid" ] = uuid;
map[ "isLuks" ] = false;
cDebug() << partition->partitionPath() cDebug() << partition->partitionPath()
<< "mtpoint:" << PartitionInfo::mountPoint( partition ) << "mtpoint:" << PartitionInfo::mountPoint( partition )
<< "fs:" << partition->fileSystem().name() << "fs:" << partition->fileSystem().name()
@ -100,6 +101,7 @@ mapForPartition( Partition* partition, const QString& uuid )
{ {
map[ "luksMapperName" ] = luksFs->suggestedMapperName( partition->partitionPath() ); map[ "luksMapperName" ] = luksFs->suggestedMapperName( partition->partitionPath() );
map[ "luksUuid" ] = getLuksUuid( partition->partitionPath() ); map[ "luksUuid" ] = getLuksUuid( partition->partitionPath() );
map[ "isLuks" ] = true;
cDebug() << "luksMapperName:" << map[ "luksMapperName" ]; cDebug() << "luksMapperName:" << map[ "luksMapperName" ];
} }
} }