fix a crash when reloading partition table (mga#9838)

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