summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-23 19:28:05 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-23 19:28:05 +0000
commit9a85819bad00420ca8cb5965021f0dd76ec565ad (patch)
tree5e1b5f5afe81ecb4720b7a00ffb808e509de2a06
parent3980ebfd98fe7be5cce63bdfba0c567a052d996a (diff)
downloaddrakx-9a85819bad00420ca8cb5965021f0dd76ec565ad.tar
drakx-9a85819bad00420ca8cb5965021f0dd76ec565ad.tar.gz
drakx-9a85819bad00420ca8cb5965021f0dd76ec565ad.tar.bz2
drakx-9a85819bad00420ca8cb5965021f0dd76ec565ad.tar.xz
drakx-9a85819bad00420ca8cb5965021f0dd76ec565ad.zip
fix a crash when reloading partition table (mga#9838)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/diskdrake/interactive.pm1
-rw-r--r--perl-install/fs/partitioning_wizard.pm1
-rw-r--r--perl-install/install/NEWS1
4 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index fd26a6c4a..94e76f722 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,5 @@
- partionning:
+ o fix a crash when reloading partition table (mga#9838)
o fix a crash when trying to create a encrypted LVM partition (mga#9837)
Version 15.42 - 21 April 2013
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 02ab8bdb1..011d61422 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -961,6 +961,7 @@ sub dmcrypt_open {
sub detect_lvms_on_dmcrypt {
my ($all_hds) = @_,
require File::Temp;
+ require fs::dmcrypt;
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) ];
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 0aa8f82f4..750e02816 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -39,6 +39,7 @@ sub partition_with_diskdrake {
$ok = 1;
my $do_force_reload = sub {
require File::Temp;
+ require fs::dmcrypt;
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();
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 7e6d18235..f5b951490 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- partionning:
+ o fix a crash when reloading partition table (mga#9838)
o fix a crash when trying to create a encrypted LVM partition (mga#9837)
Version 15.43 - 22 april 2013