From af0ff9f9bff6c8b45ddff61282359ae2e99eca20 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/NEWS                     | 3 +++
 perl-install/diskdrake/interactive.pm | 2 ++
 perl-install/fs/dmcrypt.pm            | 6 ++++--
 perl-install/install/NEWS             | 3 +++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 61107602c..b073f7688 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -7,6 +7,9 @@
 - drakboot:
   o display mountpoint if available, and size+fs_type if we have nothing 
     else (mga#5460)
+- diskdrake:
+  o do not set fs_type to ext4 for raw LVM/RAID/LUKS
+  o detect LVM on top on Encrypted partitions (mga#5330)
 
 Version 14.3 - 7 April 2012
 
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 666e7b3a9..fb60f280d 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -960,6 +960,8 @@ sub dmcrypt_open {
 	delete $part->{dmcrypt_key};
 	die(($? >> 8) == 255 ? N("Invalid key") : $@);
     }
+    # Detect LVMs on top of dmcrypt
+    $all_hds->{lvms} = [ fsedit::lvms($all_hds) ];
 }
 
 sub Add2RAID {
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}");
 
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 85c4273b1..240d5c9fc 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- do not set fs_type to ext4 for raw LVM/RAID/LUKS
+- detect LVM on top on Encrypted partitions (mga#5330)
+
 Version 14.10 - 23 April 2012
 
 - do not offer to upgrade mdv 201[1-9] (mga#5004)
-- 
cgit v1.2.1