From e3fc98f4aa9266398c4a8fc312574a8f61814892 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Fri, 19 Apr 2013 17:17:09 +0000
Subject: fix losing crypt key when re-reeading partition tables (mga#5661)

---
 perl-install/NEWS                      | 2 ++
 perl-install/fs/partitioning_wizard.pm | 5 +++++
 perl-install/install/NEWS              | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 9da01007f..efb0cbf15 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake (mga#5661):
+  o fix loosing crypt key when re-reading partition tables
 - drakauth:
   o 'nss-pam-ldapd' obsoletes 'pam_ldap' (mga#9769)
 - drakups:
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 12216bcf4..0aa8f82f4 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -38,9 +38,14 @@ sub partition_with_diskdrake {
     do {
 	$ok = 1;
 	my $do_force_reload = sub {
+            require File::Temp;
+            my (undef, $tmp_file) = File::Temp::mkstemp('/tmp/crypttab.XXXXXXX');
+            fs::dmcrypt::save_crypttab_($all_hds, $tmp_file);
             my $new_hds = fs::get::empty_all_hds();
             fs::any::get_hds($new_hds, $fstab, $manual_fstab, $partitioning_flags, $skip_mtab, $in);
             %$all_hds = %$new_hds;
+            fs::dmcrypt::read_crypttab_($all_hds, $tmp_file);
+            rm_rf($tmp_file);
             $all_hds;
 	};
 	require diskdrake::interactive;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 61bd8dadd..6c88c98d1 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,7 @@
 - authentication:
   o 'nss-pam-ldapd' obsoletes 'pam_ldap' (mga#9769)
+- partionning (mga#5661):
+  o fix loosing crypt key when re-reading partition tables
 
 Version 15.39 - 15 April 2013
 
-- 
cgit v1.2.1