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

[partition] Remove WITH_KPMCORE42 to fix luks2 support

Browse Source
This commit is contained in:
dalto 2023-03-03 19:05:06 -06:00
parent ce6f498358
commit f5b974984c
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,9 +26,7 @@
#include <kpmcore/core/partition.h>
#include <kpmcore/fs/filesystem.h>
#include <kpmcore/fs/luks.h>
#ifdef WITH_KPMCORE42API
#include <kpmcore/fs/luks2.h>
#endif
#include <QDebug>
#include <QDir>
@ -94,18 +92,18 @@ mapForPartition( Partition* partition, const QString& uuid )
map[ "parttype" ] = partition->type();
map[ "partattrs" ] = partition->attributes();
map[ "features" ] = partition->fileSystem().features();
if ( partition->fileSystem().type() == FileSystem::Luks
&& dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() )
{
map[ "fs" ] = untranslatedFS( dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() );
}
#ifdef WITH_KPMCORE42API
if ( partition->fileSystem().type() == FileSystem::Luks2
&& dynamic_cast< FS::luks2& >( partition->fileSystem() ).innerFS() )
{
map[ "fs" ] = untranslatedFS( dynamic_cast< FS::luks2& >( partition->fileSystem() ).innerFS() );
}
#endif
map[ "uuid" ] = uuid;
map[ "claimed" ] = PartitionInfo::format( partition ); // If we formatted it, it's ours