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

[partition] Chase API change in createNewPartition()

Browse Source 
The partition- and filesystem-label setting code was already there,
but not in the call to createNewPartition(); now we set the
FS label twice (once in the call, once afterwards)
This commit is contained in:
Adriaan de Groot 2021-03-27 14:45:34 +01:00
parent b602d423c7
commit 3d49379bec
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/partition/core/PartitionLayout.cpp
View File

@ -230,6 +230,7 @@ PartitionLayout::createPartitions( Device* dev,
*dev, *dev,
role, role,
entry.partFileSystem, entry.partFileSystem,
entry.partLabel,
currentSector, currentSector,
currentSector + sectors - 1, currentSector + sectors - 1,
KPM_PARTITION_FLAG( None ) ); KPM_PARTITION_FLAG( None ) );
@ -240,6 +241,7 @@ PartitionLayout::createPartitions( Device* dev,
*dev, *dev,
role, role,
entry.partFileSystem, entry.partFileSystem,
entry.partLabel,
currentSector, currentSector,
currentSector + sectors - 1, currentSector + sectors - 1,
luksPassphrase, luksPassphrase,

1
src/modules/partition/tests/PartitionJobTests.cpp
View File

@ -377,6 +377,7 @@ PartitionJobTests::testResizePartition()
*m_device, *m_device,
PartitionRole( PartitionRole::Primary ), PartitionRole( PartitionRole::Primary ),
FileSystem::Ext4, FileSystem::Ext4,
QStringLiteral( "testp" ),
oldFirst, oldFirst,
oldLast, oldLast,
KPM_PARTITION_FLAG( None ) ); KPM_PARTITION_FLAG( None ) );