From 327665c753f616babee751a013645f64a83c3f80 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Fri, 19 Apr 2013 17:17:13 +0000
Subject: fix losing crypt key when activating inactive partitions (mga#5661)

---
 perl-install/diskdrake/interactive.pm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'perl-install/diskdrake/interactive.pm')

diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 8a4d9bb9c..b1d6809cc 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -954,8 +954,18 @@ sub dmcrypt_open {
 	delete $part->{dmcrypt_key};
 	die(($? >> 8) == 255 ? N("Invalid key") : $@);
     }
-    # Detect LVMs on top of dmcrypt
+    detect_lvms_on_dmcrypt($all_hds);
+}
+
+# Detect LVMs on top of dmcrypt
+sub detect_lvms_on_dmcrypt {
+    my ($all_hds) = @_,
+    require File::Temp;
+    my (undef, $tmp_file) = File::Temp::mkstemp('/tmp/crypttab.XXXXXXX');
+    fs::dmcrypt::save_crypttab_($all_hds, $tmp_file);
     $all_hds->{lvms} = [ fsedit::lvms($all_hds) ];
+    fs::dmcrypt::read_crypttab_($all_hds, $tmp_file);
+    rm_rf($tmp_file);
 }
 
 sub Add2RAID {
-- 
cgit v1.2.1