[rhel7-branch 1/1] Revert "Fix Initial PPC PReP Boot Selector Name (#1172755)"

kellinm installerbot-noreply at redhat.com
Fri Jul 24 14:01:17 UTC 2015


From: kellinm <kellinm at users.noreply.github.com>

---
 pyanaconda/ui/gui/spokes/custom.py        | 2 +-
 pyanaconda/ui/gui/spokes/lib/accordion.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py
index 2382190..1f9d21e 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -493,7 +493,7 @@ def _populate_accordion(self):
 
             for device in new_devices:
                 if device in self.bootLoaderDevices:
-                    mounts[device.format.name] = device
+                    mounts[device.format.type] = device
 
             new_root = Root(mounts=mounts, swaps=swaps, name=translated_new_install_name())
             ui_roots.insert(0, new_root)
diff --git a/pyanaconda/ui/gui/spokes/lib/accordion.py b/pyanaconda/ui/gui/spokes/lib/accordion.py
index 95fa4dd..844f725 100644
--- a/pyanaconda/ui/gui/spokes/lib/accordion.py
+++ b/pyanaconda/ui/gui/spokes/lib/accordion.py
@@ -203,7 +203,7 @@ def removeSelector(self, selector):
 
     def _mountpointType(self, mountpoint):
         if not mountpoint or mountpoint in ["/", "/boot", "/boot/efi", "/tmp", "/usr", "/var",
-                                            "swap", "PPC PReP Boot", "BIOS Boot"]:
+                                            "biosboot", "prepboot", "swap"]:
             return SYSTEM_DEVICE
         else:
             return DATA_DEVICE


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/dccb7426a9ddeec96443836863a8bb8c78ac732f


More information about the anaconda-patches mailing list