[partition] Rename the KPMCore Partition local to part

main
Gaël PORTAY 4 years ago
parent 32c1f81fbf
commit 2007335865

@ -247,8 +247,6 @@ PartitionLayout::execute( Device* dev,
availableSectors = totalSectors;
for ( const auto& entry : qAsConst( m_partLayout ) )
{
Partition* currentPartition = nullptr;
// Adjust partition size based on available space.
qint64 sectors = partSectorsMap.value( &entry );
sectors = std::min( sectors, availableSectors );
@ -257,31 +255,32 @@ PartitionLayout::execute( Device* dev,
continue;
}
Partition* part = nullptr;
if ( luksPassphrase.isEmpty() )
{
currentPartition = KPMHelpers::createNewPartition(
part = KPMHelpers::createNewPartition(
parent, *dev, role, entry.partFileSystem, currentSector, currentSector + sectors - 1, KPM_PARTITION_FLAG( None ) );
}
else
{
currentPartition = KPMHelpers::createNewEncryptedPartition(
part = KPMHelpers::createNewEncryptedPartition(
parent, *dev, role, entry.partFileSystem, currentSector, currentSector + sectors - 1, luksPassphrase, KPM_PARTITION_FLAG( None ) );
}
PartitionInfo::setFormat( currentPartition, true );
PartitionInfo::setMountPoint( currentPartition, entry.partMountPoint );
PartitionInfo::setFormat( part, true );
PartitionInfo::setMountPoint( part, entry.partMountPoint );
if ( !entry.partLabel.isEmpty() )
{
currentPartition->setLabel( entry.partLabel );
currentPartition->fileSystem().setLabel( entry.partLabel );
part->setLabel( entry.partLabel );
part->fileSystem().setLabel( entry.partLabel );
}
if ( !entry.partUUID.isEmpty() )
{
currentPartition->setUUID( entry.partUUID );
part->setUUID( entry.partUUID );
}
if ( !entry.partType.isEmpty() )
{
#if defined( WITH_KPMCORE42API )
currentPartition->setType( entry.partType );
part->setType( entry.partType );
#else
cWarning() << "Ignoring type; requires KPMcore >= 4.2.0.";
#endif
@ -289,7 +288,7 @@ PartitionLayout::execute( Device* dev,
if ( entry.partAttributes )
{
#if defined( WITH_KPMCORE42API )
currentPartition->setAttributes( entry.partAttributes );
part->setAttributes( entry.partAttributes );
#else
cWarning() << "Ignoring attributes; requires KPMcore >= 4.2.0.";
#endif
@ -299,7 +298,7 @@ PartitionLayout::execute( Device* dev,
#if defined( WITH_KPMCORE42API )
for ( const auto& k : entry.partFeatures.keys() )
{
currentPartition->fileSystem().addFeature( k, entry.partFeatures.value( k ) );
part->fileSystem().addFeature( k, entry.partFeatures.value( k ) );
}
#else
cWarning() << "Ignoring features; requires KPMcore >= 4.2.0.";
@ -307,7 +306,7 @@ PartitionLayout::execute( Device* dev,
}
// Some buggy (legacy) BIOSes test if the bootflag of at least one partition is set.
// Otherwise they ignore the device in boot-order, so add it here.
partList.append( currentPartition );
partList.append( part );
currentSector += sectors;
availableSectors -= sectors;
}

Loading…
Cancel
Save