applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-02 11:55:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[fsresizer] [partition] Drop special cases for kpmcore 3.3.1

Browse source
This commit is contained in:
Adriaan de Groot 2019-06-13 14:10:49 +02:00
parent 9f0f08b571
commit 3930826e93
4 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/modules/partition/core/PartitionCoreModule.cpp
View file

@ -687,14 +687,9 @@ PartitionCoreModule::scanForLVMPVs()
#if defined( WITH_KPMCORE4API )
VolumeManagerDevice::scanDevices( physicalDevices );
for ( auto p : LVM::pvList::list() )
#else
#if defined( WITH_KPMCORE331API )
LvmDevice::scanSystemLVM( physicalDevices );
for ( auto p : LVM::pvList::list() )
#else
LvmDevice::scanSystemLVM( physicalDevices );
for ( auto p : LVM::pvList )
#endif
#endif
{
m_lvmPVs << p.partition().data();
@ -728,7 +723,7 @@ PartitionCoreModule::scanForLVMPVs()
if ( innerFS && innerFS->type() == FileSystem::Type::Lvm2_PV )
m_lvmPVs << p;
}
#ifdef WITH_KPMCORE4API
#if defined( WITH_KPMCORE4API )
else if ( p->fileSystem().type() == FileSystem::Type::Luks2 )
{
// Encrypted LVM PVs