From 0ef39fb7b32143ef3d9c4f17a40e24b90977ebdf Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Fri, 18 Sep 2009 16:16:52 +0000
Subject: don't consider lvm named md* as raid (#53767)

---
 perl-install/NEWS         | 1 +
 perl-install/fs/type.pm   | 2 +-
 perl-install/install/NEWS | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index c9a79dd5a..bb7bb764f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -6,6 +6,7 @@
 - diskdrake
   o suggest a LVM name and refuse empty or existing one (#53769)
   o prefer UUID on VirtIO too
+  o don't consider lvm named md* as raid (#53767)
 
 Version 12.51 - 8 September 2009
 
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 1933f33f3..244c7126d 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -349,7 +349,7 @@ sub isNonMountable {
 sub isPartOfLVM { defined $_[0]{lvm} }
 sub isPartOfRAID { defined $_[0]{raid} }
 sub isPartOfLoopback { defined $_[0]{loopback} }
-sub isRAID { $_[0]{device} =~ /^md/ }
+sub isRAID { $_[0]{device} =~ /^md/ && $_[0]{level} }
 sub isUBD { $_[0]{device} =~ /^ubd/ } #- should be always true during an $::uml_install
 sub isLVM { $_[0]{VG_name} || $_[0]{lv_name} }
 sub isLoopback { defined $_[0]{loopback_file} }
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 8cc6ba10a..098e4c6c2 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- don't consider lvm named md* as raid (#53767)
+
 Version 12.52 - 15 September 2009
 
 - RC1 logo
-- 
cgit v1.2.1