[PATCH 15/16] Special boot devices are handled the same whether they exist or not.

David Lehman dlehman at redhat.com
Thu Oct 11 23:46:05 UTC 2012


They won't show up in /etc/fstab and they don't have mountpoints, so
it really doesn't matter if they exist or not. We want to include
them in the new root regardless.
---
 pyanaconda/ui/gui/spokes/custom.py |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 6f70bb6..4eabdee 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -553,13 +553,10 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
                     if d.format.type == "swap" and d.format.exists]
 
     @property
-    def existingBootLoaderDevices(self):
+    def bootLoaderDevices(self):
         devices = []
         format_types = ["biosboot", "prepboot"]
         for device in self._devices:
-            if not device.format.exists:
-                continue
-
             if device.format.type not in format_types:
                 continue
 
@@ -668,7 +665,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
         if new_mounts or new_devices:
             new_devices.extend(self.__storage.mountpoints.values())
             new_devices.extend(self.existingSwaps)
-            new_devices.extend(self.existingBootLoaderDevices)
+            new_devices.extend(self.bootLoaderDevices)
 
         new_devices = list(set(new_devices))
 
@@ -697,7 +694,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
                                 if getattr(d.format, "mountpoint", None)])
 
             for device in new_devices:
-                if device in self.existingBootLoaderDevices:
+                if device in self.bootLoaderDevices:
                     mounts[device.format.type] = device
 
             new_root = Root(mounts=mounts, swaps=swaps, name=new_install_name)
@@ -811,7 +808,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker):
             devices.extend(self.existingSwaps)
 
             # also pull in biosboot and prepboot that are on our boot disk
-            devices.extend(self.existingBootLoaderDevices)
+            devices.extend(self.bootLoaderDevices)
 
         for _device in devices:
             mountpoint = getattr(_device.format, "mountpoint", "") or ""
-- 
1.7.7.6



More information about the anaconda-patches mailing list