Allow spares for RAID 6.

Detect reshaping progress.

diff --git a/raid/raid-lib.pl b/raid/raid-lib.pl
index 7e91bbb..05da8bb 100755 (executable)
--- a/raid/raid-lib.pl
+++ b/raid/raid-lib.pl
@@ -147,7 +147,7 @@ else {
                        elsif (/^\s*State\s*:\s*(.*)/) {
                                $md->{'state'} = $1;
                                }
-                       elsif (/^\s*Rebuild\s+Status\s*:\s*(\d+)\s*\%/) {
+                       elsif ((/^\s*Rebuild\s+Status\s*:\s*(\d+)\s*\%/) || (/^\s*Reshape\s+Status\s*:\s*(\d+)\s*\%/)) {
                                $md->{'rebuild'} = $1;
                                }
                        elsif (/^\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+|\-)\s+(.*\S)\s+(\/\S+)/) {

diff --git a/raid/raid_form.cgi b/raid/raid_form.cgi
index 8c07851..4c84213 100755 (executable)
--- a/raid/raid_form.cgi
+++ b/raid/raid_form.cgi
@@ -74,7 +74,7 @@ print &ui_table_row($text{'create_chunk'},
 print &ui_table_row($text{'create_disks'},
        &ui_select("disks", undef, \@disks, 4, 1));
 
-if ($lvl == 1 || $lvl == 4 || $lvl == 5 || $lvl == 10) {
+if ($lvl == 1 || $lvl == 4 || $lvl == 5 || $lvl == 6 || $lvl == 10) {
        print &ui_table_row($text{'create_spares'},
                &ui_select("spares", undef, \@disks, 4, 1));
        }