summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-19 17:17:09 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-19 17:17:09 +0000
commita0a2b0e1819a65000a7efd68072ecb72dd8356ae (patch)
treeb1ef3fa3c5fcea387e9b3cfcd9c64cfe1f05d8d3
parentb5cd68029b40c6a92ba67f35d05a30853119c075 (diff)
downloaddrakx-a0a2b0e1819a65000a7efd68072ecb72dd8356ae.tar
drakx-a0a2b0e1819a65000a7efd68072ecb72dd8356ae.tar.gz
drakx-a0a2b0e1819a65000a7efd68072ecb72dd8356ae.tar.bz2
drakx-a0a2b0e1819a65000a7efd68072ecb72dd8356ae.tar.xz
drakx-a0a2b0e1819a65000a7efd68072ecb72dd8356ae.zip
fix losing crypt key when re-reeading partition tables (mga#5661)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/fs/partitioning_wizard.pm5
-rw-r--r--perl-install/install/NEWS2
3 files changed, 9 insertions, 0 deletions
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