Fix raid growing

diff --git a/raid/raid-lib.pl b/raid/raid-lib.pl
index 947a2d1..188d063 100755 (executable)
--- a/raid/raid-lib.pl
+++ b/raid/raid-lib.pl
@@ -440,9 +440,15 @@ if ($raid_mode eq "mdadm") {
 # Grows a RAID set to contain totaldisks active partitions
 sub grow
 {
+local ($raid, $newdisk) = @_;
 if ($raid_mode eq "mdadm") {
        # Call mdadm command to add
-       $cmd="mdadm --grow $_[0]->{'value'} -n $_[1] 2>&1";
+       if ($newdisk =~ /^\d+$/) {
+               $cmd = "mdadm --grow $raid->{'value'} -n + $newdisk 2>&1";
+               }
+       else {
+               $cmd = "mdadm --grow $raid->{'value'} -n $newdisk 2>&1";
+               }
        local $out = &backquote_logged(
                $cmd);
        &error(&text('emdadmgrow', "<tt>'$cmd' -> $out</tt>")) if ($?);

diff --git a/raid/view_raid.cgi b/raid/view_raid.cgi
index 1517862..a963d63 100755 (executable)
--- a/raid/view_raid.cgi
+++ b/raid/view_raid.cgi
@@ -116,7 +116,7 @@ foreach $d (@devs) {
                push(@rdisks, [ $d->{'value'}, $name ]);
                $sparescnt++;
                $newdisks++;
-               push(@spares, [ "$newdisks", "+ $sparescnt" ]);
+               push(@spares, [ $newdisks, $sparescnt ]);
                }
        }
 if ($sp) {
@@ -157,7 +157,7 @@ if ($raid_mode eq "mdadm") {
                push(@grid, &ui_submit($text{'view_remove_det'}, "remove_det"),
                            $text{'view_remove_detdesc'});
                }
-       if ($sparescnt>0 && $lvl != 10) {
+       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),