From 1c2714d832ac832fff008f4615e92c66f9db595a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 27 Sep 2018 03:56:57 -0400
Subject: [PATCH] [fsresizer] Match configuration to system

 - Bail out earlier before doing any work if the configuration
   is invalid.
 - If it's valid, look for a matching device.
---
 src/modules/fsresizer/ResizeFSJob.cpp | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/modules/fsresizer/ResizeFSJob.cpp b/src/modules/fsresizer/ResizeFSJob.cpp
index 06429699b..cf2ea47f6 100644
--- a/src/modules/fsresizer/ResizeFSJob.cpp
+++ b/src/modules/fsresizer/ResizeFSJob.cpp
@@ -92,6 +92,13 @@ ResizeFSJob::prettyName() const
 Calamares::JobResult
 ResizeFSJob::exec()
 {
+    if ( !isValid() )
+        return Calamares::JobResult::error(
+            tr( "Invalid configuration" ),
+            tr( "The file-system resize job has an invalid configuration "
+                "and will not run." ) );
+
+    // Get KPMCore
     auto backend_p = CoreBackendManager::self()->backend();
     if ( backend_p )
         cDebug() << "KPMCore backend @" << (void *)backend_p << backend_p->id() << backend_p->version();
@@ -117,6 +124,9 @@ ResizeFSJob::exec()
             tr( "Calamares cannot start KPMCore for the file-system resize job." ) );
     }
 
+    Device* resize_this_device = nullptr;
+    Partition* resize_this_partition = nullptr;
+
     using DeviceList = QList< Device* >;
     DeviceList devices = backend_p->scanDevices( false );
     cDebug() << "ResizeFSJob found" << devices.count() << "devices.";
@@ -127,16 +137,18 @@ ResizeFSJob::exec()
         cDebug() << "ResizeFSJob found" << ( *dev_it )->deviceNode();
         for ( auto part_it = PartitionIterator::begin( *dev_it); part_it != PartitionIterator::end( *dev_it ); ++part_it )
         {
-            cDebug() << ".." << ( *part_it )->mountPoint();
+            cDebug() << ".." << ( *part_it )->mountPoint() << "on" << ( *part_it )->deviceNode();
+            if ( ( !m_fsname.isEmpty() && ( *part_it )->mountPoint() == m_fsname ) ||
+                 ( !m_devicename.isEmpty() && ( *part_it )->deviceNode() == m_devicename ) )
+            {
+                resize_this_device = ( *dev_it );
+                resize_this_partition = ( *part_it );
+                cDebug() << ".. matched configuration dev=" << m_devicename << "fs=" << m_fsname;
+                break;
+            }
         }
     }
 
-    if ( !isValid() )
-        return Calamares::JobResult::error(
-            tr( "Invalid configuration" ),
-            tr( "The file-system resize job has an invalid configuration "
-                "and will not run." ) );
-
     return Calamares::JobResult::ok();
 }