summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2010-01-27 00:28:23 +0000
committerPascal Terjan <pterjan@mandriva.org>2010-01-27 00:28:23 +0000
commitf55b5875bbf545a2a4bc33bf5d70820589d4397d (patch)
treee7c7fcfe0982c78ea228322921ef46efb00fa530
parentc171e831c85d97497bcddfcb6ef279162ac646fd (diff)
downloaddrakx-f55b5875bbf545a2a4bc33bf5d70820589d4397d.tar
drakx-f55b5875bbf545a2a4bc33bf5d70820589d4397d.tar.gz
drakx-f55b5875bbf545a2a4bc33bf5d70820589d4397d.tar.bz2
drakx-f55b5875bbf545a2a4bc33bf5d70820589d4397d.tar.xz
drakx-f55b5875bbf545a2a4bc33bf5d70820589d4397d.zip
support ddf1 dmraid
-rw-r--r--perl-install/NEWS4
-rw-r--r--perl-install/fs/dmraid.pm16
-rw-r--r--perl-install/install/NEWS4
3 files changed, 23 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index edec317fc..0098c9b78 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -8,9 +8,11 @@ Version 13.5 - 26 January 2009
o fix displaying empty info for USB discs
o fix detecting firewire controllers with newer kernels
o guess real vendor names for SCSI discs like we do for IDE devices
--booloader:
+- booloader:
o fix bootloader entry name for rc kernels
o remove mnb from bootloader entry name like we do for mdv
+- diskdrake:
+ o support ddf1 dmraid
Version 13.4 - 7 January 2009
diff --git a/perl-install/fs/dmraid.pm b/perl-install/fs/dmraid.pm
index fa06e05e9..68dd98a16 100644
--- a/perl-install/fs/dmraid.pm
+++ b/perl-install/fs/dmraid.pm
@@ -40,10 +40,26 @@ sub check {
}
sub _raid_devices_raw() {
+ # get the real vg names, needed for ddf1, and safer than begins_with for raid10
+ log::l("_raid_devices_raw");
+ my %vgs;
+ my %pv2vg = map {
+ log::l("got: $_");
+ my %l; @l{qw(name size stride level status subsets devs spares)} = split(':');
+ $vgs{$l{name}} = 1 if defined $l{spares};
+ if(/freeing device "(.*)", path "(.*)"/ && defined $vgs{$1}) {
+ log::l("$2 => $1");
+ { $2 => $1 };
+ }
+ } call_dmraid('-d', '-s', '-c', '-c');
map {
chomp;
log::l("got: $_");
my %l; @l{qw(pv format vg level status size)} = split(':');
+ if(defined $l{size} && defined $l{vg} && defined $pv2vg{$l{pv}} && !defined $vgs{$l{vg}}) {
+ log::l("using $pv2vg{$l{pv}} instead of $l{vg}");
+ $l{vg} = $pv2vg{$l{pv}};
+ }
if_(defined $l{size}, \%l);
} call_dmraid('-r', '-c', '-c');
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index d50ace47c..c8335ece2 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,8 @@
- try to get better initial estimation of install time
+- fix bootloader entry name for rc kernels
+- remove mnb from bootloader entry name like we do for mdv
+- support ddf1 dmraid
+
Version 13.4 - 7 January 2009