[PATCH 2/3] Put only newly created or reformated swaps to the new root

[Vratislav Podzimek]

Related: rhbz#1011391

Signed-off-by: Vratislav Podzimek 
---
 pyanaconda/ui/gui/spokes/custom.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 170f0b2..16b73ba 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -790,11 +790,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         return unused_devices

@property
-    def existingSwaps(self):
-        return [d for d in self._devices
-                    if d.format.type == "swap" and d.format.exists]
-
-    @property
     def bootLoaderDevices(self):
         devices = []
         format_types = ["biosboot", "prepboot"]
@@ -910,7 +905,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         new_mounts = [d for d in self.__storage.mountpoints.values() if d.exists]
         if new_mounts or new_devices:
             new_devices.extend(self.__storage.mountpoints.values())
-            new_devices.extend(self.existingSwaps)
             new_devices.extend(self.bootLoaderDevices)

new_devices = list(set(new_devices))
@@ -1049,9 +1043,6 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             page = Page(self.translated_new_install_name)
             expander.add(page)

-            # pull in all the existing swap devices
-            devices.extend(self.existingSwaps)
-
             # also pull in biosboot and prepboot that are on our boot disk
             devices.extend(self.bootLoaderDevices)