From b8d2f3d3caea2f17c19bc5ba4552ccb08835cc6a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 8 Nov 2005 10:19:51 +0000
Subject: do not call dmraid init() by default, call it explictly (it helps
 patching dmraid)

---
 perl-install/fs/dmraid.pm | 2 --
 perl-install/fsedit.pm    | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/perl-install/fs/dmraid.pm b/perl-install/fs/dmraid.pm
index a45a90405..dc1b9cd10 100644
--- a/perl-install/fs/dmraid.pm
+++ b/perl-install/fs/dmraid.pm
@@ -14,8 +14,6 @@ use fs::wild_device;
 use run_program;
 
 
-init() or log::l("dmraid::init failed");
-
 sub init() {
     whereis_binary('dmraid') or die "dmraid not installed";
 
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index b922bdd6d..90f277791 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -105,7 +105,8 @@ sub handle_dmraid {
 
     devices::make($_->{device}) foreach @$drives;
 
-    eval { require fs::dmraid; 1 } or return;
+    require fs::dmraid; 
+    fs::dmraid::init() or log::l("dmraid::init failed"), return;
 
     my @vgs = fs::dmraid::vgs();
     log::l(sprintf('dmraid: ' . join(' ', map { "$_->{device} [" . join(' ', @{$_->{disks}}) . "]" } @vgs)));
-- 
cgit v1.2.1