e-smith-base/sme9/e-smith-base-5.4.0-add_new_disk_to_raid1.patch

diff -bruN e-smith-base-5.4.0.old/root/sbin/e-smith/console-menu-items/manageRAID.pl e-smith-base-5.4.0/root/sbin/e-smith/console-menu-items/manageRAID.pl
--- e-smith-base-5.4.0.old/root/sbin/e-smith/console-menu-items/manageRAID.pl   2013-11-13 10:22:54.190006853 +0100
+++ e-smith-base-5.4.0/root/sbin/e-smith/console-menu-items/manageRAID.pl       2013-11-13 13:18:01.226769374 +0100
@@ -66,7 +66,7 @@
             next;
         }
 
-        next if ($devices{$dev}{State} =~ /clean|active/);
+        next if ($devices{$dev}{State} =~ /^(clean|active)\s*$/);
 
         push @unclean, "$dev => " . $devices{$dev}{State};
     }
@@ -123,9 +123,10 @@
         return;
     }
 
-    unless (scalar keys %free_disks == 1)
+    unless (scalar keys %used_disks == 1 and 
+            scalar keys %free_disks == scalar keys %used_disks)
     {
-        $text .= gettext("The free disk count must equal one.") .
+        $text .= gettext("The free and used disk count must equal one.") .
                 "\n\n" .
                 gettext("Manual intervention may be required.") . "\n\n" .
                 $disk_status;
1	diff -bruN e-smith-base-5.4.0.old/root/sbin/e-smith/console-menu-items/manageRAID.pl e-smith-base-5.4.0/root/sbin/e-smith/console-menu-items/manageRAID.pl
2	--- e-smith-base-5.4.0.old/root/sbin/e-smith/console-menu-items/manageRAID.pl 2013-11-13 10:22:54.190006853 +0100
3	+++ e-smith-base-5.4.0/root/sbin/e-smith/console-menu-items/manageRAID.pl 2013-11-13 13:18:01.226769374 +0100
4	@@ -66,7 +66,7 @@
5	next;
6	}
7
8	- next if ($devices{$dev}{State} =~ /clean\|active/);
9	+ next if ($devices{$dev}{State} =~ /^(clean\|active)\s*$/);
10
11	push @unclean, "$dev => " . $devices{$dev}{State};
12	}
13	@@ -123,9 +123,10 @@
14	return;
15	}
16
17	- unless (scalar keys %free_disks == 1)
18	+ unless (scalar keys %used_disks == 1 and
19	+ scalar keys %free_disks == scalar keys %used_disks)
20	{
21	- $text .= gettext("The free disk count must equal one.") .
22	+ $text .= gettext("The free and used disk count must equal one.") .
23	"\n\n" .
24	gettext("Manual intervention may be required.") . "\n\n" .
25	$disk_status;