From b5ad2d21fe10d57542ad36936be3a61d92f3ecd0 Mon Sep 17 00:00:00 2001 From: Vratislav Podzimek Date: Thu, 3 Oct 2013 16:02:36 +0200 Subject: [PATCH 02/27] Put only newly created or reformated swaps to the new root Signed-off-by: Vratislav Podzimek (cherry picked from commit 1f529f8ee33d5bd48ca7b1469bb455fa9ba35be4) Related: rhbz#1011391 --- 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 1c804e6..86f70ac 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -805,11 +805,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"] @@ -941,7 +936,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)) @@ -1082,9 +1076,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) -- 1.9.3