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

[partition] kpmcore latest release doesn't support FileSystem::Type::Luks2

Browse Source
This commit is contained in:
Caio Carvalho 2018-06-14 15:37:00 -03:00
parent 3b6c764f75
commit 98a158c6e5
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/partition/CMakeLists.txt
View File

@ -12,6 +12,10 @@ set_package_properties(
) )
if ( KPMcore_FOUND ) if ( KPMcore_FOUND )
if ( KPMcore_VERSION VERSION_GREATER "3.3.0")
add_definitions(-DWITH_KPMCOREGT33) # kpmcore greater than 3.3
endif()
include_directories( ${KPMCORE_INCLUDE_DIR} ) include_directories( ${KPMCORE_INCLUDE_DIR} )
include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )

12
src/modules/partition/core/PartitionCoreModule.cpp
View File

@ -618,7 +618,7 @@ PartitionCoreModule::scanForLVMPVs()
if ( p->fileSystem().type() == FileSystem::Type::Lvm2_PV ) if ( p->fileSystem().type() == FileSystem::Type::Lvm2_PV )
m_lvmPVs << p; m_lvmPVs << p;
else if ( p->fileSystem().type() == FileSystem::Type::Luks || p->fileSystem().type() == FileSystem::Type::Luks2 ) else if ( p->fileSystem().type() == FileSystem::Type::Luks )
{ {
// Encrypted LVM PVs // Encrypted LVM PVs
FileSystem* innerFS = static_cast<const FS::luks*>(&p->fileSystem())->innerFS(); FileSystem* innerFS = static_cast<const FS::luks*>(&p->fileSystem())->innerFS();
@ -626,6 +626,16 @@ PartitionCoreModule::scanForLVMPVs()
if ( innerFS && innerFS->type() == FileSystem::Type::Lvm2_PV ) if ( innerFS && innerFS->type() == FileSystem::Type::Lvm2_PV )
m_lvmPVs << p; m_lvmPVs << p;
} }
#ifdef WITH_KPMCOREGT33
else if ( p->fileSystem().type() == FileSystem::Type::Luks2 )
{
// Encrypted LVM PVs
FileSystem* innerFS = static_cast<const FS::luks*>(&p->fileSystem())->innerFS();
if ( innerFS && innerFS->type() == FileSystem::Type::Lvm2_PV )
m_lvmPVs << p;
}
#endif
} }
} }
} }