[master 1/1] Fix Initial PPC PReP Boot Selector Name (#1172755)

kellinm installerbot-noreply at redhat.com
Thu Jul 23 18:14:31 UTC 2015


From: Robert Marshall <rmarshall at redhat.com>

The auto partition tool added the PPC PReP Boot partition and named it
prepboot in the selector view in the GUI installer. This was due to the
mountpoint being named by the device format type. Changed the mountpoint
namer so that it is named after the device name instead.

Change required adding BIOS Boot as a name in the mountpoint types to
avoid unexpected behavior as a side effect from this change.

Resolves: rhbz#1172755
---
 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 aa7d6fb..0dd8a21 100644
--- a/pyanaconda/ui/gui/spokes/custom.py
+++ b/pyanaconda/ui/gui/spokes/custom.py
@@ -509,7 +509,7 @@ def _populate_accordion(self):
 
             for device in new_devices:
                 if device in self.bootLoaderDevices:
-                    mounts[device.format.type] = device
+                    mounts[device.format.name] = 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 4b6240d..d65abb3 100644
--- a/pyanaconda/ui/gui/spokes/lib/accordion.py
+++ b/pyanaconda/ui/gui/spokes/lib/accordion.py
@@ -212,7 +212,7 @@ def removeSelector(self, selector):
 
     def _mountpointType(self, mountpoint):
         if not mountpoint or mountpoint in ["/", "/boot", "/boot/efi", "/tmp", "/usr", "/var",
-                                            "biosboot", "prepboot", "swap"]:
+                                            "swap", "PPC PReP Boot", "BIOS Boot"]:
             return SYSTEM_DEVICE
         else:
             return DATA_DEVICE


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


More information about the anaconda-patches mailing list