Make some fixes to the rescue mode system selection UI (#489973, #489977).

(1) When there's more than one system to choose from, display the name of the
device, its release string, and the label if it exists.

(2) Return the right type when the user makes a selection from the combo box.

1 files changed, 5 insertions, 2 deletions

diff --git a/rescue.py b/rescue.py
index 688266f41..fdd78475f 100644
--- a/rescue.py
+++ b/rescue.py
@@ -273,7 +273,10 @@ def runRescue(anaconda, instClass):
 
         devList = []
         for (device, relstr) in disks:
-            devList.append(device.path)
+            if getattr(device.format, "label", None):
+                devList.append("%s (%s) - %s" % (device.name, device.format.label, relstr))
+            else:
+                devList.append("%s - %s" % (device.name, relstr))
 
         (button, choice) = \
             ListboxChoiceWindow(screen, _("System to Rescue"),
@@ -286,7 +289,7 @@ def runRescue(anaconda, instClass):
         if button == string.lower (_("Exit")):
             root = None
         else:
-            root = disks[choice][0]
+            root = disks[choice]
 
     rootmounted = 0