(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.
---
rescue.py | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/rescue.py b/rescue.py
index 688266f..96f492b 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 device.format.label:
+ 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
--
1.6.1.3
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
