From a2b21ee0873bdbf9cde18d1537286a1a855ca78f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 17 Feb 2024 14:18:24 +0100
Subject: [PATCH 01/10] [partition] Improve readability in
 edit-existing-partition

Pick out the condition and give it a name. The logic is the
same -- and is made worse because of the if() which looks
redundant at this point.
---
 .../gui/EditExistingPartitionDialog.cpp          | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
index 55303d06d..9636799a9 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -130,10 +130,18 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,
     m_ui->fileSystemComboBox->setEnabled( m_ui->formatRadioButton->isChecked() );
 
     // Force a format if the existing device is a zfs device since reusing a zpool isn't currently supported
-    m_ui->formatRadioButton->setChecked( m_partition->fileSystem().type() == FileSystem::Type::Zfs );
-    m_ui->formatRadioButton->setEnabled( !( m_partition->fileSystem().type() == FileSystem::Type::Zfs ) );
-    m_ui->keepRadioButton->setChecked( !( m_partition->fileSystem().type() == FileSystem::Type::Zfs ) );
-    m_ui->keepRadioButton->setEnabled( !( m_partition->fileSystem().type() == FileSystem::Type::Zfs ) );
+    const bool partitionIsZFS = m_partition->fileSystem().type() == FileSystem::Type::Zfs;
+    if ( partitionIsZFS )
+    {
+        m_ui->formatRadioButton->setChecked( true );
+    }
+    else
+    {
+        m_ui->formatRadioButton->setChecked( false );
+    }
+    m_ui->formatRadioButton->setEnabled( !partitionIsZFS );
+    m_ui->keepRadioButton->setChecked( !partitionIsZFS );
+    m_ui->keepRadioButton->setEnabled( !partitionIsZFS );
 
     setFlagList( *( m_ui->m_listFlags ), m_partition->availableFlags(), PartitionInfo::flags( m_partition ) );
 }

From ecd8839ac922ba965c99c4cb263ea3d12ebad36e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 17 Feb 2024 14:26:39 +0100
Subject: [PATCH 02/10] [partition] Set up label checkbox later

If the update-fs-label checkbox and drop-down depend on the
state of the format button, then set that up only once we're
done deciding on the format button.
---
 src/modules/partition/gui/EditExistingPartitionDialog.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
index 9636799a9..4c02e2d0b 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -126,9 +126,6 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,
         m_ui->fileSystemComboBox->setCurrentText( FileSystem::nameForType( defaultFSType ) );
     }
 
-    m_ui->fileSystemLabel->setEnabled( m_ui->formatRadioButton->isChecked() );
-    m_ui->fileSystemComboBox->setEnabled( m_ui->formatRadioButton->isChecked() );
-
     // Force a format if the existing device is a zfs device since reusing a zpool isn't currently supported
     const bool partitionIsZFS = m_partition->fileSystem().type() == FileSystem::Type::Zfs;
     if ( partitionIsZFS )
@@ -143,6 +140,9 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,
     m_ui->keepRadioButton->setChecked( !partitionIsZFS );
     m_ui->keepRadioButton->setEnabled( !partitionIsZFS );
 
+    m_ui->fileSystemLabel->setEnabled( m_ui->formatRadioButton->isChecked() );
+    m_ui->fileSystemComboBox->setEnabled( m_ui->formatRadioButton->isChecked() );
+
     setFlagList( *( m_ui->m_listFlags ), m_partition->availableFlags(), PartitionInfo::flags( m_partition ) );
 }
 

From f23b4ff2671712e5d7746a7bf983885364a13d85 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 17 Feb 2024 15:40:42 +0100
Subject: [PATCH 03/10] [partition] Preserve the will-it-be-formatted flag of
 the partition

---
 .../partition/gui/EditExistingPartitionDialog.cpp    | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
index 4c02e2d0b..a76bee289 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -128,14 +128,7 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,
 
     // Force a format if the existing device is a zfs device since reusing a zpool isn't currently supported
     const bool partitionIsZFS = m_partition->fileSystem().type() == FileSystem::Type::Zfs;
-    if ( partitionIsZFS )
-    {
-        m_ui->formatRadioButton->setChecked( true );
-    }
-    else
-    {
-        m_ui->formatRadioButton->setChecked( false );
-    }
+    m_ui->formatRadioButton->setChecked( partitionIsZFS || PartitionInfo::format( m_partition ) );
     m_ui->formatRadioButton->setEnabled( !partitionIsZFS );
     m_ui->keepRadioButton->setChecked( !partitionIsZFS );
     m_ui->keepRadioButton->setEnabled( !partitionIsZFS );
@@ -205,6 +198,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
             {
                 core->setPartitionFlags( m_device, m_partition, resultFlags );
             }
+            PartitionInfo::setFormat( m_partition, false );
         }
     }
     else
@@ -221,6 +215,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
                     core->setPartitionFlags( m_device, m_partition, resultFlags );
                 }
                 core->setFilesystemLabel( m_device, m_partition, fsLabel );
+                PartitionInfo::setFormat( m_partition, true );
             }
             else  // otherwise, we delete and recreate the partition with new fs type
             {
@@ -254,6 +249,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
             {
                 core->setFilesystemLabel( m_device, m_partition, fsLabel );
             }
+            PartitionInfo::setFormat( m_partition, false );
 
             core->refreshPartition( m_device, m_partition );
         }

From d5f32be5e3ce162b19bb2871b87ae3b178478167 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 17 Feb 2024 17:03:27 +0100
Subject: [PATCH 04/10] [partition] Repair enable/disable status of FS label

The entry field was always enabled, but the label of the
FS-label entry field depended on the format button.
---
 src/modules/partition/gui/EditExistingPartitionDialog.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
index a76bee289..9c8d543e7 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -69,9 +69,10 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,
              this,
              &EditExistingPartitionDialog::checkMountPointSelection );
 
-    // The filesystem label dialog is always enabled, because we may want to change
+    // The filesystem label field is always enabled, because we may want to change
     // the label on the current filesystem without formatting.
     m_ui->fileSystemLabelEdit->setText( m_partition->fileSystem().label() );
+    m_ui->fileSystemLabel->setEnabled(true);
 
     replacePartResizerWidget();
 
@@ -81,7 +82,6 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,
              {
                  replacePartResizerWidget();
 
-                 m_ui->fileSystemLabel->setEnabled( doFormat );
                  m_ui->fileSystemComboBox->setEnabled( doFormat );
 
                  if ( !doFormat )
@@ -133,7 +133,6 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,
     m_ui->keepRadioButton->setChecked( !partitionIsZFS );
     m_ui->keepRadioButton->setEnabled( !partitionIsZFS );
 
-    m_ui->fileSystemLabel->setEnabled( m_ui->formatRadioButton->isChecked() );
     m_ui->fileSystemComboBox->setEnabled( m_ui->formatRadioButton->isChecked() );
 
     setFlagList( *( m_ui->m_listFlags ), m_partition->availableFlags(), PartitionInfo::flags( m_partition ) );

From fc2bb1ede0ecc7e8af703c14429042730a7b74a8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 17 Feb 2024 17:33:37 +0100
Subject: [PATCH 05/10] [partition] Add a helper for intended FS labels

The KPMCore partition label returns what **is**, not
what is intended. While here, fix some typo's in comments.
---
 src/modules/partition/README.md              |  8 +++----
 src/modules/partition/core/PartitionInfo.cpp | 22 ++++++++++++++++++++
 src/modules/partition/core/PartitionInfo.h   |  8 ++++++-
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/modules/partition/README.md b/src/modules/partition/README.md
index cbebd589e..d9d0d87d9 100644
--- a/src/modules/partition/README.md
+++ b/src/modules/partition/README.md
@@ -1,4 +1,4 @@
-# Architecture
+#Architecture
 
 <!-- SPDX-FileCopyrightText: 2014 Aurélien Gâteau <agateau@kde.org>
      SPDX-FileCopyrightText: 2016 Teo Mrnjavac <teo@kde.org>
@@ -47,7 +47,7 @@ Calamares-specific properties to the Partition instances: setting the install
 mount point is done with `PartitionInfo::setMountPoint(partition, "/")`,
 retrieving it is done with `mountPoint = PartitionInfo::mountPoint(partition)`.
 
-The rational behind this unusual design is simplicity: the alternative would
+The rationale behind this unusual design is simplicity: the alternative would
 have been to keep a separate PartitionInfo object and a map linking each
 Partition to its PartitionInfo instance. Such a design makes things more
 complicated. It complicates memory management: if a Partition goes away, its
@@ -60,7 +60,7 @@ the real Partition object. This would have worked and would have made for a less
 surprising API, but it would mean more Calamares-specific patches on KPMcore.
 
 
-# Tests
+#Tests
 
 The module comes with unit tests for the partition jobs. Those tests need to
 run on storage device which does not contain any data you care about.
@@ -78,7 +78,7 @@ this:
     sudo CALAMARES_TEST_DISK=/dev/sdb $top_build_dir/partitionjobtests
 
 
-# TODO
+#TODO
 
 - Support resizing extended partitions. ResizePartitionJob should already
   support this but the UI prevents editing of extended partitions for now.
diff --git a/src/modules/partition/core/PartitionInfo.cpp b/src/modules/partition/core/PartitionInfo.cpp
index 06a88f333..708c6f3a0 100644
--- a/src/modules/partition/core/PartitionInfo.cpp
+++ b/src/modules/partition/core/PartitionInfo.cpp
@@ -14,6 +14,7 @@
 // KPMcore
 #include <kpmcore/core/lvmdevice.h>
 #include <kpmcore/core/partition.h>
+#include <kpmcore/fs/filesystemfactory.h>
 
 // Qt
 #include <QVariant>
@@ -24,6 +25,7 @@ namespace PartitionInfo
 static const char MOUNT_POINT_PROPERTY[] = "_calamares_mountPoint";
 static const char FORMAT_PROPERTY[] = "_calamares_format";
 static const char FLAGS_PROPERTY[] = "_calamares_flags";
+static const char LABEL_PROPERTY[] = "_calamares_label";
 
 QString
 mountPoint( const Partition* partition )
@@ -74,12 +76,32 @@ setFlags( Partition* partition, PartitionTable::Flags f )
     partition->setProperty( FLAGS_PROPERTY, PartitionTable::Flags::Int( f ) );
 }
 
+QString
+label( const Partition* partition )
+{
+    auto v = partition->property( LABEL_PROPERTY );
+    if ( !v.isValid() )
+    {
+        return partition->fileSystem().label();
+    }
+    return v.toString();
+}
+
+void
+setLabel( Partition* partition, const QString& value )
+{
+    partition->setProperty( LABEL_PROPERTY, value );
+}
+
+
 void
 reset( Partition* partition )
 {
+    // Setting a property to an invalid QVariant is equal to removing it
     partition->setProperty( MOUNT_POINT_PROPERTY, QVariant() );
     partition->setProperty( FORMAT_PROPERTY, QVariant() );
     partition->setProperty( FLAGS_PROPERTY, QVariant() );
+    partition->setProperty( LABEL_PROPERTY, QVariant() );
 }
 
 bool
diff --git a/src/modules/partition/core/PartitionInfo.h b/src/modules/partition/core/PartitionInfo.h
index 387576c10..b4368f0f5 100644
--- a/src/modules/partition/core/PartitionInfo.h
+++ b/src/modules/partition/core/PartitionInfo.h
@@ -21,7 +21,9 @@ class Partition;
  * Functions to store Calamares-specific information in the Qt properties of a
  * Partition object.
  *
- * See README.md for the rational behind this design.
+ * See README.md for the rationale behind this design. Roughly, these
+ * functions access **intent** while the existing Partition methods
+ * access current state.
  *
  * Properties:
  * - mountPoint: which directory will a partition be mounted on the installed
@@ -29,6 +31,7 @@ class Partition;
  *   directory on which a partition is *currently* mounted while the installer
  *   is running.
  * - format: whether this partition should be formatted at install time.
+ * - label: label to apply to the filesystem in the partition
  */
 namespace PartitionInfo
 {
@@ -42,6 +45,9 @@ void setFormat( Partition* partition, bool value );
 PartitionTable::Flags flags( const Partition* partition );
 void setFlags( Partition* partition, PartitionTable::Flags f );
 
+QString label( const Partition* partition );
+void setLabel( Partition* partition, const QString& value );
+
 void reset( Partition* partition );
 
 /**

From 23d203b00b952e5666b53b0ec3900bbbc6b0b9ae Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 17 Feb 2024 17:13:18 +0100
Subject: [PATCH 06/10] [partition] Set label intentions for filesystems

FIXES #1992
---
 .../gui/EditExistingPartitionDialog.cpp       | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
index 9c8d543e7..66f1fb3ef 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -45,6 +45,19 @@
 using Calamares::Partition::untranslatedFS;
 using Calamares::Partition::userVisibleFS;
 
+static void
+updateLabel( PartitionCoreModule* core, Device* device, Partition* partition, const QString& fsLabel )
+{
+    // In this case, we are not formatting the partition, but we are setting the
+    // label on the current filesystem, if any. We only create the job if the
+    // label actually changed.
+    if ( partition->fileSystem().type() != FileSystem::Type::Unformatted && fsLabel != partition->fileSystem().label() )
+    {
+        core->setFilesystemLabel( device, partition, fsLabel );
+        PartitionInfo::setLabel(partition, fsLabel);
+    }
+}
+
 EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,
                                                           Partition* partition,
                                                           const QStringList& usedMountPoints,
@@ -71,8 +84,8 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,
 
     // The filesystem label field is always enabled, because we may want to change
     // the label on the current filesystem without formatting.
-    m_ui->fileSystemLabelEdit->setText( m_partition->fileSystem().label() );
-    m_ui->fileSystemLabel->setEnabled(true);
+    m_ui->fileSystemLabelEdit->setText( PartitionInfo::label(m_partition));
+    m_ui->fileSystemLabel->setEnabled( true );
 
     replacePartResizerWidget();
 
@@ -197,6 +210,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
             {
                 core->setPartitionFlags( m_device, m_partition, resultFlags );
             }
+            updateLabel( core, m_device, m_partition, fsLabel );
             PartitionInfo::setFormat( m_partition, false );
         }
     }
@@ -240,14 +254,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
             {
                 core->setPartitionFlags( m_device, m_partition, resultFlags );
             }
-            // In this case, we are not formatting the partition, but we are setting the
-            // label on the current filesystem, if any. We only create the job if the
-            // label actually changed.
-            if ( m_partition->fileSystem().type() != FileSystem::Type::Unformatted
-                 && fsLabel != m_partition->fileSystem().label() )
-            {
-                core->setFilesystemLabel( m_device, m_partition, fsLabel );
-            }
+            updateLabel( core, m_device, m_partition, fsLabel );
             PartitionInfo::setFormat( m_partition, false );
 
             core->refreshPartition( m_device, m_partition );

From 3881737bbdabd442d5773bcbe1cf91d3b2b828cb Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 17 Feb 2024 17:55:34 +0100
Subject: [PATCH 07/10] [partition] Set intent while creating FS-labeling job

---
 src/modules/partition/core/PartitionCoreModule.cpp        | 6 ++++--
 src/modules/partition/gui/EditExistingPartitionDialog.cpp | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index dafa6a9a0..c362dca0e 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -557,15 +557,17 @@ PartitionCoreModule::formatPartition( Device* device, Partition* partition )
 void
 PartitionCoreModule::setFilesystemLabel( Device* device, Partition* partition, const QString& newLabel )
 {
-    if ( newLabel.isEmpty() )
+    if ( newLabel == PartitionInfo::label( partition ) )
     {
-        // Don't bother
         return;
     }
+
     auto deviceInfo = infoForDevice( device );
     Q_ASSERT( deviceInfo );
 
     OperationHelper helper( partitionModelForDevice( device ), this );
+    PartitionInfo::setLabel( partition, newLabel );
+    deviceInfo->takeJob< ChangeFilesystemLabelJob >( partition );
     deviceInfo->makeJob< ChangeFilesystemLabelJob >( partition, newLabel );
 }
 
diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
index 66f1fb3ef..7b815b296 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -54,7 +54,6 @@ updateLabel( PartitionCoreModule* core, Device* device, Partition* partition, co
     if ( partition->fileSystem().type() != FileSystem::Type::Unformatted && fsLabel != partition->fileSystem().label() )
     {
         core->setFilesystemLabel( device, partition, fsLabel );
-        PartitionInfo::setLabel(partition, fsLabel);
     }
 }
 
@@ -84,7 +83,7 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,
 
     // The filesystem label field is always enabled, because we may want to change
     // the label on the current filesystem without formatting.
-    m_ui->fileSystemLabelEdit->setText( PartitionInfo::label(m_partition));
+    m_ui->fileSystemLabelEdit->setText( PartitionInfo::label( m_partition ) );
     m_ui->fileSystemLabel->setEnabled( true );
 
     replacePartResizerWidget();

From 2ea5a2b5d534e3cc3e130455d2e61c4cd5efd393 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 17 Feb 2024 22:47:19 +0100
Subject: [PATCH 08/10] [partition] Set radio buttons conistently

Put the setChecked() calls together so that it is obvious
that only one is checked. *Keep* button is the inverse of
*Format* now. Previously, it used only the not-ZFS value,
and so would override the value obtained from the partition's
*format* setting.
---
 .../partition/gui/EditExistingPartitionDialog.cpp        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
index 7b815b296..34f0dea4f 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -138,13 +138,16 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,
         m_ui->fileSystemComboBox->setCurrentText( FileSystem::nameForType( defaultFSType ) );
     }
 
-    // Force a format if the existing device is a zfs device since reusing a zpool isn't currently supported
+    // Force a format if the existing device is a zfs device since reusing a
+    // zpool isn't currently supported; disable the radio buttons then.
     const bool partitionIsZFS = m_partition->fileSystem().type() == FileSystem::Type::Zfs;
-    m_ui->formatRadioButton->setChecked( partitionIsZFS || PartitionInfo::format( m_partition ) );
     m_ui->formatRadioButton->setEnabled( !partitionIsZFS );
-    m_ui->keepRadioButton->setChecked( !partitionIsZFS );
     m_ui->keepRadioButton->setEnabled( !partitionIsZFS );
 
+    const bool formatChecked = partitionIsZFS || PartitionInfo::format( m_partition );
+    m_ui->formatRadioButton->setChecked( formatChecked );
+    m_ui->keepRadioButton->setChecked( !formatChecked );
+
     m_ui->fileSystemComboBox->setEnabled( m_ui->formatRadioButton->isChecked() );
 
     setFlagList( *( m_ui->m_listFlags ), m_partition->availableFlags(), PartitionInfo::flags( m_partition ) );

From d640f17ddfde063efd7e4195bf9ca529009a8324 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 17 Feb 2024 23:49:13 +0100
Subject: [PATCH 09/10] [partition] When format is selected, clear out existing
 jobs

When editing a partition multiple times, do not leave
jobs from previous edits around. Apply fresh jobs each time.
---
 .../partition/core/PartitionCoreModule.cpp    | 28 +++++++++++++++++++
 .../partition/core/PartitionCoreModule.h      |  1 +
 .../gui/EditExistingPartitionDialog.cpp       |  3 ++
 3 files changed, 32 insertions(+)

diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index c362dca0e..51e99f2d2 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -166,6 +166,23 @@ struct PartitionCoreModule::DeviceInfo
         return Calamares::job_ptr( nullptr );
     }
 
+    /** @brief Take the jobs of any type that apply to @p partition */
+    void takeJobs( Partition* partition )
+    {
+        for ( auto it = m_jobs.begin(); it != m_jobs.end(); )
+        {
+            PartitionJob* job = qobject_cast< PartitionJob* >( it->data() );
+            if ( job && job->partition() == partition )
+            {
+                it = m_jobs.erase( it );
+            }
+            else
+            {
+                ++it;
+            }
+        }
+    }
+
     /** @brief Add a job of given type to the job list
      */
     template < typename Job, typename... Args >
@@ -1144,6 +1161,17 @@ PartitionCoreModule::clearJobs()
     updateIsDirty();
 }
 
+void
+PartitionCoreModule::clearJobs( Device* device, Partition* partition )
+{
+    DeviceInfo* devInfo = infoForDevice( device );
+
+    if ( devInfo )
+    {
+        devInfo->takeJobs( partition );
+    }
+}
+
 
 bool
 PartitionCoreModule::isDirty()
diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h
index bf5145a90..40a1916a9 100644
--- a/src/modules/partition/core/PartitionCoreModule.h
+++ b/src/modules/partition/core/PartitionCoreModule.h
@@ -218,6 +218,7 @@ public:
     void asyncRevertDevice( Device* dev, std::function< void() > callback );  //like revertDevice, but asynchronous
 
     void clearJobs();  // only clear jobs, the Device* states are preserved
+    void clearJobs( Device* device, Partition* partition );  // clears all jobs changing @p partition
 
     bool isDirty();  // true if there are pending changes, otherwise false
 
diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
index 34f0dea4f..df4117dff 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -190,6 +190,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
     {
         if ( m_ui->formatRadioButton->isChecked() )
         {
+            core->clearJobs( m_device, m_partition );
             Partition* newPartition = KPMHelpers::createNewPartition( m_partition->parent(),
                                                                       *m_device,
                                                                       m_partition->roles(),
@@ -224,6 +225,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
             // if the FS type is unchanged, we just format
             if ( m_partition->fileSystem().type() == fsType )
             {
+                core->clearJobs( m_device, m_partition );
                 core->formatPartition( m_device, m_partition );
                 if ( currentFlags != resultFlags )
                 {
@@ -234,6 +236,7 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
             }
             else  // otherwise, we delete and recreate the partition with new fs type
             {
+                core->clearJobs( m_device, m_partition );
                 Partition* newPartition = KPMHelpers::createNewPartition( m_partition->parent(),
                                                                           *m_device,
                                                                           m_partition->roles(),

From 1e59092bf5c46a2a3f8463c42e4c26cc38b96d2a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 18 Feb 2024 22:38:03 +0100
Subject: [PATCH 10/10] [partition] Clear jobs and reset intent

Start from a clean slate of intentions when applying changes
in the edit dialog. While here, shuffle debugging around so
that we get more useful information at once.
---
 .../gui/EditExistingPartitionDialog.cpp       | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
index df4117dff..7a3f4951a 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -164,16 +164,18 @@ EditExistingPartitionDialog::newFlags() const
 void
 EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
 {
-    PartitionInfo::setMountPoint( m_partition, selectedMountPoint( m_ui->mountPointComboBox ) );
+    // Remove jobs that we might have created for this partition already,
+    // and also clear intentions so that we set the current ones unconditionally.
+    core->clearJobs( m_device, m_partition );
+    PartitionInfo::reset( m_partition );
+
+    const QString mountPoint = selectedMountPoint( m_ui->mountPointComboBox );
+    PartitionInfo::setMountPoint( m_partition, mountPoint );
 
     qint64 newFirstSector = m_partitionSizeController->firstSector();
     qint64 newLastSector = m_partitionSizeController->lastSector();
     bool partResizedMoved = newFirstSector != m_partition->firstSector() || newLastSector != m_partition->lastSector();
 
-    cDebug() << "old boundaries:" << m_partition->firstSector() << m_partition->lastSector() << m_partition->length();
-    cDebug() << Logger::SubEntry << "new boundaries:" << newFirstSector << newLastSector;
-    cDebug() << Logger::SubEntry << "dirty status:" << m_partitionSizeController->isDirty();
-
     FileSystem::Type fsType = FileSystem::Unknown;
     if ( m_ui->formatRadioButton->isChecked() )
     {
@@ -186,11 +188,17 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
     const auto resultFlags = newFlags();
     const auto currentFlags = PartitionInfo::flags( m_partition );
 
+    cDebug() << m_partition->partitionPath() << "format?" << m_ui->formatRadioButton->isChecked() << "label=" << fsLabel
+             << "mount=" << mountPoint;
+
     if ( partResizedMoved )
     {
+        cDebug() << "old boundaries:" << m_partition->firstSector() << m_partition->lastSector()
+                 << m_partition->length();
+        cDebug() << Logger::SubEntry << "new boundaries:" << newFirstSector << newLastSector;
+
         if ( m_ui->formatRadioButton->isChecked() )
         {
-            core->clearJobs( m_device, m_partition );
             Partition* newPartition = KPMHelpers::createNewPartition( m_partition->parent(),
                                                                       *m_device,
                                                                       m_partition->roles(),
@@ -225,7 +233,6 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
             // if the FS type is unchanged, we just format
             if ( m_partition->fileSystem().type() == fsType )
             {
-                core->clearJobs( m_device, m_partition );
                 core->formatPartition( m_device, m_partition );
                 if ( currentFlags != resultFlags )
                 {
@@ -236,7 +243,6 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
             }
             else  // otherwise, we delete and recreate the partition with new fs type
             {
-                core->clearJobs( m_device, m_partition );
                 Partition* newPartition = KPMHelpers::createNewPartition( m_partition->parent(),
                                                                           *m_device,
                                                                           m_partition->roles(),