Sort disk lists

diff --git a/raid/raid-lib.pl b/raid/raid-lib.pl
index 79d0e6a..4ba8321 100755 (executable)
--- a/raid/raid-lib.pl
+++ b/raid/raid-lib.pl
@@ -613,7 +613,7 @@ foreach $vg (&lvm::list_volume_groups()) {
                              &text('create_lvm', $lv->{'vg'}, $lv->{'name'}) ]);
                }
        }
-return @disks;
+return sort { $a->[0] cmp $b->[0] } @disks;
 }
 
 # convert_to_hd(device)

diff --git a/raid/view_raid.cgi b/raid/view_raid.cgi
index 3008b91..1517862 100755 (executable)
--- a/raid/view_raid.cgi
+++ b/raid/view_raid.cgi
@@ -87,7 +87,8 @@ if ($raid->{'rebuild'}) {
 
 # Display partitions in RAID
 $rp = undef;
-@devs = &find('device', $raid->{'members'});
+@devs = sort { $a->{'value'} cmp $b->{'value'} }
+            &find('device', $raid->{'members'});
 foreach $d (@devs) {
        if (&find('raid-disk', $d->{'members'}) ||
             &find('parity-disk', $d->{'members'})) {
@@ -149,6 +150,7 @@ if ($raid_mode eq "mdadm") {
                            $text{'view_adddesc'});
                }
        if (@rdisks > 1) {
+               @rdisks = sort { $a->[0] cmp $b->[0] } @rdisks;
                push(@grid, &ui_submit($text{'view_remove'}, "remove")." ".
                            &ui_select("rdisk", undef, \@rdisks),
                            $text{'view_removedesc'});
@@ -156,6 +158,7 @@ if ($raid_mode eq "mdadm") {
                            $text{'view_remove_detdesc'});
                }
        if ($sparescnt>0 && $lvl != 10) {
+               @spares = sort { $a->[0] cmp $b->[0] } @spares;
                push(@grid, &ui_submit($text{'view_grow'}, "grow")." ".
                            &ui_select("ndisk", undef, \@spares),
                            $text{'view_growdesc'});