Fixed spare disk display with mdadm

diff --git a/raid/raid-lib.pl b/raid/raid-lib.pl
index e111ddd..c532e6d 100644 (file)
--- a/raid/raid-lib.pl
+++ b/raid/raid-lib.pl
@@ -150,7 +150,7 @@ else {
                        elsif (/^\s*Rebuild\s+Status\s*:\s*(\d+)\s*\%/) {
                                $md->{'rebuild'} = $1;
                                }
-                       elsif (/^\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(.*\S)\s+(\/\S+)/) {
+                       elsif (/^\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+|\-)\s+(.*\S)\s+(\/\S+)/) {
                                # A device line
                                local $device = { 'name' => 'device',
                                                  'value' => $6,

diff --git a/raid/raid_form.cgi b/raid/raid_form.cgi
index 551de06..62f1546 100755 (executable)
--- a/raid/raid_form.cgi
+++ b/raid/raid_form.cgi
@@ -71,12 +71,12 @@ print &ui_table_row($text{'create_disks'},
        &ui_select("disks", undef, \@disks, 4, 1));
 
 if ($lvl >= 4 && $lvl != 10) {
-       print &ui_select($text{'create_spares'},
+       print &ui_table_row($text{'create_spares'},
                &ui_select("spares", undef, \@disks, 4, 1));
        }
 
 if ($lvl == 4 && $raid_mode ne 'mdadm') {
-       print &ui_select($text{'create_pdisk'},
+       print &ui_table_row($text{'create_pdisk'},
                &ui_select("pdisk", '', [ [ '', $text{'create_auto'} ],
                                          @disks ], 4, 1));
        }

diff --git a/raid/view_raid.cgi b/raid/view_raid.cgi
index b8559ee..fc425f5 100755 (executable)
--- a/raid/view_raid.cgi
+++ b/raid/view_raid.cgi
@@ -129,13 +129,12 @@ if ($raid_mode eq "raidtools" && !$st[2]) {
 if ($raid_mode eq "mdadm") {
        # Only MDADM can add or remove a device (so far)
        @disks = &find_free_partitions([ $raid->{'value'} ], 0, 1);
-       if ($disks) {
+       if (@disks) {
                push(@grid, &ui_submit($text{'view_add'}, "add")." ".
                            &ui_select("disk", undef, \@disks),
                            $text{'view_adddesc'});
                }
-
-       if ($rdisks_count > 1) {
+       if (@rdisks > 1) {
                push(@grid, &ui_submit($text{'view_remove'}, "remove")." ".
                            &ui_select("rdisk", undef, \@rdisks),
                            $text{'view_removedesc'});