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

[partition] Collect more kpmcore 4.2 code

Browse Source
This commit is contained in:
Adriaan de Groot 2021-01-20 14:56:34 +01:00
parent 520f08bbba
commit 6978ce3cb4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,14 +84,14 @@ mapForPartition( Partition* partition, const QString& uuid )
map[ "device" ] = partition->partitionPath(); map[ "device" ] = partition->partitionPath();
map[ "partlabel" ] = partition->label(); map[ "partlabel" ] = partition->label();
map[ "partuuid" ] = partition->uuid(); map[ "partuuid" ] = partition->uuid();
#ifdef WITH_KPMCORE42API
map[ "parttype" ] = partition->type();
map[ "partattrs" ] = partition->attributes();
#endif
map[ "mountPoint" ] = PartitionInfo::mountPoint( partition ); map[ "mountPoint" ] = PartitionInfo::mountPoint( partition );
map[ "fsName" ] = userVisibleFS( partition->fileSystem() ); map[ "fsName" ] = userVisibleFS( partition->fileSystem() );
map[ "fs" ] = untranslatedFS( partition->fileSystem() ); map[ "fs" ] = untranslatedFS( partition->fileSystem() );
#ifdef WITH_KPMCORE42API
map[ "parttype" ] = partition->type();
map[ "partattrs" ] = partition->attributes();
map[ "features" ] = partition->fileSystem().features(); map[ "features" ] = partition->fileSystem().features();
#endif
if ( partition->fileSystem().type() == FileSystem::Luks if ( partition->fileSystem().type() == FileSystem::Luks
&& dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() ) && dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() )
{ {