From 2df9667aa6108df2855b2e1c25c6f70f1ab32003 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Mon, 19 Oct 2009 12:17:45 +0000
Subject: fix raid detection during install (#54706)

---
 perl-install/NEWS         | 1 +
 perl-install/install/NEWS | 1 +
 perl-install/raid.pm      | 7 +++----
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 038a8da57..2723f05d7 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,5 @@
 - fix raid initialisation during install (#54706)
+- fix raid detection during install (#54706)
 
 Version 12.67 - 18 October 2009
 
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 3a49ab92c..61713f637 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
 - fix raid initialisation during install (#54706)
+- fix raid detection during install (#54706)
 
 Version 12.67 - 18 October 2009
 
diff --git a/perl-install/raid.pm b/perl-install/raid.pm
index 93ec9748e..11284a90a 100644
--- a/perl-install/raid.pm
+++ b/perl-install/raid.pm
@@ -182,6 +182,9 @@ sub free_mds {
 
 sub detect_during_install {
     my (@parts) = @_;
+    foreach (@{allmodules()}) {
+	eval { modules::load($_) };
+    }
     detect_during_install_once(@parts);
     detect_during_install_once(@parts) if active_mds(); #- try again to detect RAID 10
 
@@ -198,10 +201,6 @@ sub detect_during_install_once {
 				   (map { "/dev/$_" } active_mds()), 
 				   map { devices::make($_->{device}) } @parts), "\n");
     run_program::run('mdadm', '>>', '/etc/mdadm.conf', '--examine', '--scan');
-
-    foreach (@{allmodules()}) {
-	eval { modules::load(module($_)) };
-    }
     run_program::run('mdadm', '--assemble', '--scan');    
 }
 
-- 
cgit v1.2.1