Fix RAID growing

diff --git a/raid/lang/en b/raid/lang/en
index f84b7c9..0450064 100644 (file)
--- a/raid/lang/en
+++ b/raid/lang/en
@@ -78,6 +78,7 @@ view_start=Activate
 view_startdesc=Click this button to re-activate this RAID device.
 view_disks=Partitions in RAID
 view_spares=Spare partitions
+view_addspare=Add $1
 view_size=Usable size
 view_resync=Percent of resync done
 view_down=(Down)

diff --git a/raid/raid-lib.pl b/raid/raid-lib.pl
index 188d063..01b44be 100755 (executable)
--- a/raid/raid-lib.pl
+++ b/raid/raid-lib.pl
@@ -443,12 +443,7 @@ sub grow
 local ($raid, $newdisk) = @_;
 if ($raid_mode eq "mdadm") {
        # Call mdadm command to add
-       if ($newdisk =~ /^\d+$/) {
-               $cmd = "mdadm --grow $raid->{'value'} -n + $newdisk 2>&1";
-               }
-       else {
-               $cmd = "mdadm --grow $raid->{'value'} -n $newdisk 2>&1";
-               }
+       $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 a963d63..790bb05 100755 (executable)
--- a/raid/view_raid.cgi
+++ b/raid/view_raid.cgi
@@ -116,7 +116,8 @@ foreach $d (@devs) {
                push(@rdisks, [ $d->{'value'}, $name ]);
                $sparescnt++;
                $newdisks++;
-               push(@spares, [ $newdisks, $sparescnt ]);
+               push(@spares, [ $newdisks,
+                               &text('view_addspare', $sparescnt) ]);
                }
        }
 if ($sp) {