diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2009-09-03 14:39:07 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2009-09-03 14:39:07 +0000 |
| commit | 5fc81c088b47553a3b7b5169b6b757171075e66f (patch) | |
| tree | 99125259d97007d3ed719f071888bc50686103ae | |
| parent | dab3ab288325f9b960326c90d7b53953be009dad (diff) | |
| download | drakx-5fc81c088b47553a3b7b5169b6b757171075e66f.tar drakx-5fc81c088b47553a3b7b5169b6b757171075e66f.tar.gz drakx-5fc81c088b47553a3b7b5169b6b757171075e66f.tar.bz2 drakx-5fc81c088b47553a3b7b5169b6b757171075e66f.tar.xz drakx-5fc81c088b47553a3b7b5169b6b757171075e66f.zip | |
fix existing raid detection during install (#53159)
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/raid.pm | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 4d87ad5c9..ff4116fa6 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,6 +1,7 @@ - allow minimal install without suggests (#45665) - install the right kernel-XXX-devel-latest flavor instead of hardcoding 'kernel-desktop-devel-latest' +- fix existing raid detection during install (#53159) Version 12.47 - 1 September 2009 diff --git a/perl-install/raid.pm b/perl-install/raid.pm index 5252511a0..e681a4649 100644 --- a/perl-install/raid.pm +++ b/perl-install/raid.pm @@ -94,6 +94,10 @@ sub updateSize { }; } +sub allmodules { + [ 'raid0', 'raid1', 'raid10', 'raid456' ]; +} + sub module { my ($part) = @_; my $level = $part->{level}; @@ -195,7 +199,7 @@ sub detect_during_install_once { map { devices::make($_->{device}) } @parts), "\n"); run_program::run('mdadm', '>>', '/etc/mdadm.conf', '--examine', '--scan'); - foreach (@{parse_mdadm_conf(scalar cat_('/etc/mdadm.conf'))->{ARRAY}}) { + foreach (@{allmodules()}) { eval { modules::load(module($_)) }; } run_program::run('mdadm', '--assemble', '--scan'); |