Sophie

Sophie

distrib > Mandriva > 2009.1 > x86_64 > media > contrib-release-src > by-pkgid > 7b662e5d67ce3d8b18d5c9fabf7cf429 > files > 3

drakx-installer-stage2-tmb-12.28.1-1mdv2009.1.src.rpm

diff -Nurp drakx-installer-stage2-12.28.1.orig/perl-install/raid.pm drakx-installer-stage2-12.28.1/perl-install/raid.pm
--- drakx-installer-stage2-12.28.1.orig/perl-install/raid.pm	2009-04-14 19:24:03.000000000 +0300
+++ drakx-installer-stage2-12.28.1/perl-install/raid.pm	2009-04-19 14:36:29.505846954 +0300
@@ -91,6 +91,7 @@ sub updateSize {
 	elsif (/1/)     { min @l }
 	elsif (/4|5/)   { min(@l) * (@l - 1) }
 	elsif (/6/)     { min(@l) * (@l - 2) }
+	elsif (/10/)	{ min(@l) * (@l / 2) }
     };
 }
 
@@ -101,6 +102,8 @@ sub module {
 
     if (member($level, 4, 5, 6)) {
 	'raid456';
+    } elsif (member($level, 10)) {
+	'raid10';
     } elsif ($level =~ /^\d+$/) {
 	"raid$level";
     } else {
@@ -153,7 +156,7 @@ sub format_part {
 sub verify {
     my ($raids) = @_;
     foreach (@$raids) {
-	my $nb = $_->{level} =~ /6/ ? 4 : $_->{level} =~ /4|5/ ? 3 : 2;
+	my $nb = $_->{level} =~ /6|10/ ? 4 : $_->{level} =~ /4|5/ ? 3 : 2;
 	@{$_->{disks}} >= $nb or die N("Not enough partitions for RAID level %d\n", $_->{level});
     }
 }