diff options
author | David Lehman <dlehman@redhat.com> | 2012-10-11 12:00:18 -0500 |
---|---|---|
committer | David Lehman <dlehman@redhat.com> | 2012-10-12 09:24:55 -0500 |
commit | 1223f7b1159deb53240dd92a6c64a192f4eaa357 (patch) | |
tree | 3bfafccca424ffa1ee8aadb4dd9b563c3cc904b5 | |
parent | 095bf952d71ca7b356069fd436b65582eb42b77d (diff) | |
download | anaconda-1223f7b1159deb53240dd92a6c64a192f4eaa357.tar.gz anaconda-1223f7b1159deb53240dd92a6c64a192f4eaa357.tar.xz anaconda-1223f7b1159deb53240dd92a6c64a192f4eaa357.zip |
Special boot devices are handled the same whether they exist or not.
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.
-rw-r--r-- | 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 6f70bb649..4eabdeee0 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 "" |