From 3d49379bec68774df447c1e33c74a87b377560b6 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 27 Mar 2021 14:45:34 +0100 Subject: [PATCH] [partition] Chase API change in createNewPartition() 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) --- src/modules/partition/core/PartitionLayout.cpp | 2 ++ src/modules/partition/tests/PartitionJobTests.cpp | 1 + 2 files changed, 3 insertions(+) diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp index d6f817af7..23eaeda62 100644 --- a/src/modules/partition/core/PartitionLayout.cpp +++ b/src/modules/partition/core/PartitionLayout.cpp @@ -230,6 +230,7 @@ PartitionLayout::createPartitions( Device* dev, *dev, role, entry.partFileSystem, + entry.partLabel, currentSector, currentSector + sectors - 1, KPM_PARTITION_FLAG( None ) ); @@ -240,6 +241,7 @@ PartitionLayout::createPartitions( Device* dev, *dev, role, entry.partFileSystem, + entry.partLabel, currentSector, currentSector + sectors - 1, luksPassphrase, diff --git a/src/modules/partition/tests/PartitionJobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp index 57dc2579c..4dddf4377 100644 --- a/src/modules/partition/tests/PartitionJobTests.cpp +++ b/src/modules/partition/tests/PartitionJobTests.cpp @@ -377,6 +377,7 @@ PartitionJobTests::testResizePartition() *m_device, PartitionRole( PartitionRole::Primary ), FileSystem::Ext4, + QStringLiteral( "testp" ), oldFirst, oldLast, KPM_PARTITION_FLAG( None ) );