Use hash for disk list

1 files changed, 13 insertions, 13 deletions

diff --git a/setup b/setup
index 5c66f0c..d995d2f 100755
--- a/setup
+++ b/setup
@@ -9,7 +9,7 @@ d = dialog.Dialog()
 d.setBackgroundTitle('Dyson Installer')
 
 
-HDD = []
+HDD = {}
 
 def get_hdd():
     pat = re.compile('\d+\.\s+(\S+)\s+<(.+)>')
@@ -17,18 +17,17 @@ def get_hdd():
     for line in out:
         match = pat.search(line)
         if match:
-            HDD.append({
-                'name': match.group(1),
-                'desc': match.group(2),
-                'use': 0,
-                })
+            HDD[match.group(1)] = {
+                    'desc' : match.group(2),
+                    'use' : 0,
+                }
     if len(HDD) == 0:
         d.msgbox(width=50, title='Error: no disks found',
                 text='\nSorry, no hard disks found on your system. Installation is not possible.')
         sys.exit(1)
     # if there is only one disk, use it by default:
-    if len(HDD) == 1:
-        HDD[0]['use'] = 1
+#    if len(HDD) == 1:
+#        HDD[0]['use'] = 1
 
 
 
@@ -36,7 +35,8 @@ def choose_hdd():
     while True:
         choices = []
         for hdd in HDD:
-            choices.append((hdd['name'], hdd['desc'], hdd['use']))
+            props = HDD[hdd]
+            choices.append((hdd, props['desc'], props['use']))
         (code, disks) = d.checklist(choices=choices, width=70, height=20,
             title='Choose disks to use for ZFS root pool',
             text='''
@@ -47,11 +47,11 @@ If disk does not have a Solaris partition you will be asked to create one.''')
         if code:
             break
         if len(disks) > 0:
-            for hdd in HDD:
-                if hdd['name'] in disks:
-                    hdd['use'] = 1
+            for h in HDD:
+                if h in disks:
+                    HDD[h]['use'] = 1
                 else:
-                    hdd['use'] = 0
+                    HDD[h]['use'] = 0
             break
         else:
             d.msgbox(width=40, height=8, title='You need at least one disk',