[PATCH 2/2] In custom part, don't display mountpoints without associated disks (#865942).

Chris Lumens clumens at redhat.com
Tue Oct 23 20:56:57 UTC 2012


This is an attempt to throw out loopback mounts, bind mounts, and optical
media.  We can't do anything with those things, so we shouldn't even display
them.  They are left in Roots just in case we one day think up another need
for this information.
---
 pyanaconda/ui/gui/spokes/custom.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index e24fe7c..404f844 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -723,7 +723,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             # Don't make a page if none of the root's devices are left.
             # Also, only include devices in an old page if the format is intact.
             if not [d for d in root.swaps + root.mounts.values()
-                        if d in self._devices and
+                        if d in self._devices and d.disks and
                            (root.name == new_install_name or d.format.exists)]:
                 continue
 
@@ -732,6 +732,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
 
             for (mountpoint, device) in root.mounts.iteritems():
                 if device not in self._devices or \
+                   not device.disks or \
                    (root.name != new_install_name and not device.format.exists):
                     continue
 
-- 
1.7.11.2



More information about the anaconda-patches mailing list