From eca86ee951a05c35bcfddba4f8988c2f0e23004f Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mageia.org>
Date: Mon, 23 Apr 2012 23:33:00 +0000
Subject: detect LVM on top on Encrypted partitions (mga#5330)

---
 perl-install/fs/dmcrypt.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'perl-install/fs')

diff --git a/perl-install/fs/dmcrypt.pm b/perl-install/fs/dmcrypt.pm
index ae0f71714..a0f5b6559 100644
--- a/perl-install/fs/dmcrypt.pm
+++ b/perl-install/fs/dmcrypt.pm
@@ -127,8 +127,10 @@ sub _get_existing_one {
 	put_in_hash($part, $type);
     }
     fs::type::set_isFormatted($part, to_bool($part->{fs_type}));
-    
-    $part->{fs_type} or fs::type::set_fs_type($part, defaultFS());
+
+    unless (fs::type::cannotBeMountable($part)) {
+	$part->{fs_type} or fs::type::set_fs_type($part, defaultFS());
+    }
 
     log::l("dmcrypt: found $part->{device} type $part->{fs_type} with rootDevice $part->{rootDevice}");
 
-- 
cgit v1.2.1